Fix a crash when use hopper counter

bedrock-dev · Apr 27, 2022 · ce99e30 · ce99e30
1 parent 32143e1
commit ce99e30
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/mod/function/HopperCounter.cpp b/mod/function/HopperCounter.cpp
@@ -123,6 +123,10 @@ THook(
   trapdoor::Actor *nearestPlayer = nullptr;
 
   auto *hopper_block = real_this->getBlock();
+  if (!hopper_block) {
+    // original(hopperActor, index, itemStack);
+    return;
+  }
   trapdoor::bdsMod->getLevel()->forEachPlayer([&](trapdoor::Actor *player) {
     if (!player)
       return;
@@ -135,7 +139,13 @@ THook(
     }
   });
 
+  if (!nearestPlayer) {
+    // original(hopperActor, index, itemStack);
+    return;
+  }
+
   auto bs = nearestPlayer->getBlockSource();
+
   auto hopperBlockVariant =
       (trapdoor::FACING)bs->getBlock(*position)->getVariant();
   auto attachBlockPos =