Sponge & Explosion fixes by Cody

retromcorg · Aug 9, 2024 · 4eed931 · 4eed931
1 parent cc77c44
commit 4eed931
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java b/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java
@@ -188,6 +188,9 @@ private void write() {
         generateConfigOption("command.tps.info", "Enables the /tps command to show the server's TPS for various intervals.");
         generateConfigOption("command.tps.enabled", true);
 
+        //UberBukkit
+        generateConfigOption("fix.optimize-sponges", true);
+
         //Tree Leave Destroy Blacklist
         if (Boolean.valueOf(String.valueOf(getConfigOption("world.settings.block-tree-growth.enabled", true)))) {
             if (String.valueOf(this.getConfigOption("world.settings.block-tree-growth.list", "")).trim().isEmpty()) {

diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
@@ -1,33 +1,40 @@
 package net.minecraft.server;
 
-public class BlockSponge extends Block {
+import com.legacyminecraft.poseidon.PoseidonConfig;
 
+public class BlockSponge extends Block {
     protected BlockSponge(int i) {
         super(i, Material.SPONGE);
         this.textureId = 48;
     }
 
-    public void c(World world, int i, int j, int k) {
-        byte b0 = 2;
+    public void remove(World world, int i, int j, int k) {
+        byte radius = 2;
 
-        for (int l = i - b0; l <= i + b0; ++l) {
-            for (int i1 = j - b0; i1 <= j + b0; ++i1) {
-                for (int j1 = k - b0; j1 <= k + b0; ++j1) {
-                    if (world.getMaterial(l, i1, j1) == Material.WATER) {
-                        ;
-                    }
+        if (PoseidonConfig.getInstance().getConfigBoolean("fix.optimize-sponges")) {
+            this.optimizedRemove(world, i, j, k, radius);
+            return;
+        }
+
+        for (int x = i - radius; x <= i + radius; ++x) {
+            for (int y = j - radius; y <= j + radius; ++y) {
+                for (int z = k - radius; z <= k + radius; ++z) {
+                    world.applyPhysics(x, y, z, world.getTypeId(x, y, z));
                 }
             }
         }
     }
 
-    public void remove(World world, int i, int j, int k) {
-        byte b0 = 2;
+    private void optimizedRemove(World world, int i, int j, int k, byte radius) {
+        for (int x = i - radius; x <= i + radius; ++x) {
+            for (int y = j - radius; y <= j + radius; ++y) {
+                if (y > 127 || y < 0) continue;
+
+                for (int z = k - radius; z <= k + radius; ++z) {
+                    int type = world.getTypeId(x, y, z);
+                    if ((type != Block.WATER.id && type != Block.STATIONARY_WATER.id)) continue;
 
-        for (int l = i - b0; l <= i + b0; ++l) {
-            for (int i1 = j - b0; i1 <= j + b0; ++i1) {
-                for (int j1 = k - b0; j1 <= k + b0; ++j1) {
-                    world.applyPhysics(l, i1, j1, world.getTypeId(l, i1, j1));
+                    world.applyPhysics(x, y, z, type);
                 }
             }
         }

diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
@@ -169,7 +169,9 @@ public void a() {
 
         this.size = f;
 
-        ArrayList<ChunkPosition> arraylist = new ArrayList<>(this.blocks);
+        ArrayList<ChunkPosition> arraylist = new ArrayList<>();
+        arraylist.addAll(this.blocks);
+
         if (this.setFire) {
             for (int l2 = arraylist.size() - 1; l2 >= 0; --l2) {
                 ChunkPosition chunkposition = arraylist.get(l2);
@@ -360,4 +362,4 @@ public int hashCode() {
         }
     }
     // Paper end
-}
+}