Small tweaks

ArkoSammy12 · Aug 18, 2024 · 2c1fb17 · 2c1fb17
1 parent c1e8d2d
commit 2c1fb17
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/main/java/xd/arkosammy/creeperhealing/mixin/ExplosionMixin.java b/src/main/java/xd/arkosammy/creeperhealing/mixin/ExplosionMixin.java
@@ -124,13 +124,7 @@ private void setThreadLocals(boolean particles, CallbackInfo ci) {
     private void emitExplosionContext(boolean particles, CallbackInfo ci) {
         ExplosionUtils.DROP_BLOCK_ITEMS.set(true);
         ExplosionUtils.DROP_CONTAINER_INVENTORY_ITEMS.set(true);
-        if (world.isClient()) {
-            this.vanillaAffectedPositions.clear();
-            this.affectedStatesAndBlockEntities.clear();
-            this.indirectlyAffectedPositions.clear();
-            return;
-        }
-        if (!this.creeperhealing$shouldHeal()) {
+        if (world.isClient() || !this.creeperhealing$shouldHeal()) {
             this.vanillaAffectedPositions.clear();
             this.affectedStatesAndBlockEntities.clear();
             this.indirectlyAffectedPositions.clear();
@@ -154,8 +148,12 @@ private void emitExplosionContext(boolean particles, CallbackInfo ci) {
         }
         List<BlockPos> filteredAffectedPositions = new ArrayList<>();
         for (BlockPos pos : this.vanillaAffectedPositions) {
+            Pair<BlockState, BlockEntity> pair = this.affectedStatesAndBlockEntities.get(pos);
+            if (pair == null) {
+                continue;
+            }
+            BlockState state = pair.getLeft();
             // Hardcoded exception, place before all other logic
-            BlockState state = this.affectedStatesAndBlockEntities.get(pos).getLeft();
             if (ExcludedBlocks.isExcluded(state)) {
                 continue;
             }