Tracking entities killed by blocks (fire, lava, etc...)

matcracker · Apr 12, 2020 · 7282731 · 7282731
1 parent cc263e4
commit 7282731
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 16 deletions.
diff --git a/src/matcracker/BedcoreProtect/listeners/EntityListener.php b/src/matcracker/BedcoreProtect/listeners/EntityListener.php
@@ -29,6 +29,7 @@
 use pocketmine\entity\object\FallingBlock;
 use pocketmine\entity\object\Painting;
 use pocketmine\event\entity\EntityBlockChangeEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
 use pocketmine\event\entity\EntityDeathEvent;
 use pocketmine\event\entity\EntityDespawnEvent;
@@ -112,12 +113,14 @@ public function trackEntityDeath(EntityDeathEvent $event): void
     {
         $entity = $event->getEntity();
         if ($this->plugin->getParsedConfig()->isEnabledWorld($entity->getLevel()) && $this->plugin->getParsedConfig()->getEntityKills()) {
-            $ev = $entity->getLastDamageCause();
-            if ($ev instanceof EntityDamageByEntityEvent) {
-                $damager = $ev->getDamager();
+            $damageEvent = $entity->getLastDamageCause();
+            if ($damageEvent instanceof EntityDamageByEntityEvent) {
+                $damager = $damageEvent->getDamager();
                 if ($damager !== null) {
                     $this->entitiesQueries->addEntityLogByEntity($damager, $entity, Action::KILL());
                 }
+            } elseif ($damageEvent instanceof EntityDamageByBlockEvent) {
+                $this->entitiesQueries->addEntityLogByBlock($entity, $damageEvent->getDamager(), Action::KILL());
             }
         }
     }

diff --git a/src/matcracker/BedcoreProtect/storage/queries/EntitiesQueries.php b/src/matcracker/BedcoreProtect/storage/queries/EntitiesQueries.php
@@ -28,6 +28,7 @@
 use matcracker\BedcoreProtect\math\Area;
 use matcracker\BedcoreProtect\storage\QueryManager;
 use matcracker\BedcoreProtect\utils\Utils;
+use pocketmine\block\Block;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\Player;
@@ -87,19 +88,7 @@ function () use ($damager, $entity, $action): Generator {
 
                 /** @var int $lastId */
                 $lastId = yield $this->addRawLog(Utils::getEntityUniqueId($damager), $entity, $action);
-
-                $entity->saveNBT();
-
-                if ($entity instanceof Living) {
-                    $entity->namedtag->setFloat("Health", $entity->getMaxHealth());
-                }
-
-                yield $this->executeInsert(QueriesConst::ADD_ENTITY_LOG, [
-                    'log_id' => $lastId,
-                    'uuid' => Utils::getEntityUniqueId($entity),
-                    'id' => $entity->getId(),
-                    'nbt' => Utils::serializeNBT($entity->namedtag)
-                ]);
+                yield $this->addEntityLog($lastId, $entity);
             },
             static function (): void {
                 //NOOP
@@ -122,6 +111,40 @@ final public function addEntityGenerator(Entity $entity): Generator
         );
     }
 
+    final protected function addEntityLog(int $logId, Entity $entity): Generator
+    {
+        $entity->saveNBT();
+
+        if ($entity instanceof Living) {
+            $entity->namedtag->setFloat("Health", $entity->getMaxHealth());
+        }
+
+        return $this->executeInsert(QueriesConst::ADD_ENTITY_LOG, [
+            'log_id' => $logId,
+            'uuid' => Utils::getEntityUniqueId($entity),
+            'id' => $entity->getId(),
+            'nbt' => Utils::serializeNBT($entity->namedtag)
+        ]);
+    }
+
+    public function addEntityLogByBlock(Entity $entity, Block $block, Action $action): void
+    {
+        Await::f2c(
+            function () use ($entity, $block, $action): Generator {
+                yield $this->addEntityGenerator($entity);
+
+                $name = $block->getName();
+                /** @var int $lastId */
+                $lastId = yield $this->addRawLog("{$name}-uuid", $block->asPosition(), $action);
+
+                yield $this->addEntityLog($lastId, $entity);
+            },
+            static function (): void {
+                //NOOP
+            }
+        );
+    }
+
     final public function addEntity(Entity $entity): void
     {
         Await::f2c(