fix collision optimization mixinw

SpongePowered · May 16, 2020 · bf9e6d3 · bf9e6d3
1 parent 11d9861
commit bf9e6d3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 34 deletions.
diff --git a/...pongepowered/common/mixin/optimization/mcp/entity/EntityMixin_Optimization_Collision.java b/...pongepowered/common/mixin/optimization/mcp/entity/EntityMixin_Optimization_Collision.java
@@ -25,13 +25,17 @@
 package org.spongepowered.common.mixin.optimization.mcp.entity;
 
 import net.minecraft.entity.Entity;
+import net.minecraft.fluid.Fluid;
+import net.minecraft.tags.Tag;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.common.bridge.world.WorldBridge;
 import org.spongepowered.common.bridge.world.chunk.ActiveChunkReferantBridge;
 import org.spongepowered.common.bridge.world.chunk.ChunkBridge;
 
@@ -54,4 +58,23 @@ public abstract class EntityMixin_Optimization_Collision {
         return true;
     }
 
+    @Inject(method = "handleFluidAcceleration", at = @At("HEAD"), cancellable = true)
+    private void activeCollision$BailIfNeighborsAreInactive(final Tag<Fluid> p_210500_1_, final CallbackInfoReturnable<Boolean> cir) {
+        final ChunkBridge activeChunk = ((ActiveChunkReferantBridge) this).bridge$getActiveChunk();
+        if (activeChunk == null || activeChunk.bridge$isQueuedForUnload() || !activeChunk.bridge$areNeighborsLoaded()) {
+            cir.setReturnValue(false);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @Redirect(method = "handleFluidAcceleration", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;isAreaLoaded(IIIIII)Z"))
+    private boolean activeCollision$IgnoreAreaIsLoaded(final World world, final int xStart, final int yStart, final int zStart,
+            final int xEnd, final int yEnd, final int zEnd) {
+        if (((WorldBridge) world).bridge$isFake()) {
+            return world.isAreaLoaded(xStart, yStart, zStart, xEnd, yEnd, zEnd);
+        }
+        return true;
+    }
+
+
 }
diff --git a/.../spongepowered/common/mixin/optimization/mcp/world/WorldMixin_Optimization_Collision.java b/.../spongepowered/common/mixin/optimization/mcp/world/WorldMixin_Optimization_Collision.java
@@ -24,49 +24,17 @@
  */
 package org.spongepowered.common.mixin.optimization.mcp.world;
 
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.common.bridge.world.WorldBridge;
-import org.spongepowered.common.bridge.world.chunk.ActiveChunkReferantBridge;
-import org.spongepowered.common.bridge.world.chunk.ChunkBridge;
 
 @Mixin(value = World.class, priority = 1500)
 public abstract class WorldMixin_Optimization_Collision {
 
-    @Shadow public boolean isFlammableWithin(final AxisAlignedBB bb) { return false; } // shadow
-
-    @Shadow private boolean isAreaLoaded(
-        final int xStart, final int yStart, final int zStart, final int xEnd, final int yEnd, final int zEnd, final boolean allowEmpty) { return false; } // SHADOW
-
-    @Redirect(method = "isFlammableWithin", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;isAreaLoaded(IIIIIIZ)Z"))
+    @Redirect(method = "isFlammableWithin", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;isAreaLoaded(IIIIII)Z"))
     private boolean activeCollision$IgnoreIsAreaLoaded(final World world, final int xStart, final int yStart, final int zStart,
-        final int xEnd, final int yEnd, final int zEnd, final boolean allowEmpty) {
-        return true;
-    }
-
-    @Inject(method = "handleMaterialAcceleration", at = @At("HEAD"), cancellable = true)
-    private void activeCollision$BailIfNeighborsAreInactive(final AxisAlignedBB bb, final Material materialIn, final Entity entityIn,
-        final CallbackInfoReturnable<Boolean> cir) {
-        final ChunkBridge activeChunk = ((ActiveChunkReferantBridge) entityIn).bridge$getActiveChunk();
-        if (activeChunk == null || activeChunk.bridge$isQueuedForUnload() || !activeChunk.bridge$areNeighborsLoaded()) {
-            cir.setReturnValue(false);
-        }
-    }
-
-    @Redirect(method = "handleMaterialAcceleration", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;isAreaLoaded(IIIIIIZ)Z"))
-    private boolean activeCollision$IgnoreAreaIsLoaded(final World world, final int xStart, final int yStart, final int zStart,
-        final int xEnd, final int yEnd, final int zEnd, final boolean allowEmpty) {
-        if (((WorldBridge) this).bridge$isFake()) {
-            return this.isAreaLoaded(xStart, yStart, zStart, xEnd, yEnd, zEnd, allowEmpty);
-        }
+        final int xEnd, final int yEnd, final int zEnd) {
         return true;
     }