Stop updating flowing block if material has changed

2015-06-30 19:46:05 -07:00 · 2015-06-30 19:46:05 -07:00 · 7ef5da4a4d
Commit 7ef5da4a4d
--- a/Spigot-Server-Patches/0047-Configurable-end-credits-when-leaving-the-end.patch
+++ b/Spigot-Server-Patches/0047-Configurable-end-credits-when-leaving-the-end.patch
@ -1,4 +1,4 @@
-From d1648cfa0731ff5038989e59f95ebef8a013bce8 Mon Sep 17 00:00:00 2001
+From 36c08f6ff5fad0333451734342c43914b42244f1 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Thu, 28 May 2015 20:12:38 -0500
 Subject: [PATCH] Configurable end credits when leaving the end
@ -74,12 +74,12 @@ index 617f26c..a698e84 100644
             return;
         }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 3c011c2..e14e961 100644
+index 81438c3..6de509c 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -259,4 +259,10 @@ public class PaperSpigotWorldConfig
-     {
-         optimizeDraining = getBoolean( "optimize-draining", false );
+@@ -253,4 +253,10 @@ public class PaperSpigotWorldConfig
+         useAsyncLighting = getBoolean( "use-async-lighting", false );
+         log( "World async lighting: " + useAsyncLighting );
     }
 +
 +    public boolean disableEndCredits;
@ -89,5 +89,5 @@ index 3c011c2..e14e961 100644
 +    }
 }
 -- 
-2.4.2.windows.1
+1.9.5.msysgit.1

--- a/Spigot-Server-Patches/0048-Force-load-chunks-for-specific-entities-that-fly-thr.patch
+++ b/Spigot-Server-Patches/0048-Force-load-chunks-for-specific-entities-that-fly-thr.patch
@ -1,4 +1,4 @@
-From b9323137c152e0205ab6b1a5112689f17c53ce30 Mon Sep 17 00:00:00 2001
+From f31bdc80c4a037f804480ccab8cd3d990faff65f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 May 2015 22:01:25 -0500
 Subject: [PATCH] Force load chunks for specific entities that fly through
@ -126,10 +126,10 @@ index f507134..aec39a8 100644
                     entity.ad = false;
                 }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index e14e961..f51962e 100644
+index 6de509c..e6ecaff 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -265,4 +265,14 @@ public class PaperSpigotWorldConfig
+@@ -259,4 +259,14 @@ public class PaperSpigotWorldConfig
     {
         disableEndCredits = getBoolean( "game-mechanics.disable-end-credits", false );
     }
@ -169,5 +169,5 @@ index 7ca1b24..dcab40c 100644
             return true;
         }
 -- 
-2.4.2.windows.1
+1.9.5.msysgit.1

--- a/Spigot-Server-Patches/0052-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0052-Generator-Settings.patch
@ -1,4 +1,4 @@
-From 7be77b35db2b5abe1e1b6472738d27f8394b8ed4 Mon Sep 17 00:00:00 2001
+From 2eefb422efbed501a33d2ecafd84e328931110f4 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 2 Jun 2015 00:41:23 -0700
 Subject: [PATCH] Generator Settings
@ -243,10 +243,10 @@ index 0f8211a..e76acfc 100644
         Iterator iterator = this.e.values().iterator();
 
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index f51962e..8338cc6 100644
+index e6ecaff..b9b76ce 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -275,4 +275,28 @@ public class PaperSpigotWorldConfig
+@@ -269,4 +269,28 @@ public class PaperSpigotWorldConfig
         loadUnloadedTNTEntities = getBoolean( "load-chunks.tnt-entities", false );
         loadUnloadedFallingBlocks = getBoolean( "load-chunks.falling-blocks", false );
     }
@ -276,5 +276,5 @@ index f51962e..8338cc6 100644
 +    }
 }
 -- 
-2.4.2.windows.1
+1.9.5.msysgit.1

--- a/Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch
+++ b/Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch
@ -1,4 +1,4 @@
-From 942cb1cd958e2f53867973e9bc61a89c09286055 Mon Sep 17 00:00:00 2001
+From 972c16bba62bcb2570fadb20544d2335fe082276 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Thu, 4 Jun 2015 13:55:02 -0700
 Subject: [PATCH] Configurable TNT cannon fix
@ -298,10 +298,10 @@ index 349854f..f40f465 100644
                             this.k.put((EntityHuman) entity, new Vec3D(d8 * d13, d9 * d13, d10 * d13));
                         }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 8338cc6..3edd322 100644
+index b9b76ce..37369e8 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -299,4 +299,43 @@ public class PaperSpigotWorldConfig
+@@ -293,4 +293,43 @@ public class PaperSpigotWorldConfig
         generateVillage = getBoolean( "generator-settings.village", true );
         generateFlatBedrock = getBoolean( "generator-settings.flat-bedrock", false );
     }
@ -346,5 +346,5 @@ index 8338cc6..3edd322 100644
 +    }
 }
 -- 
-2.4.4.windows.2
+1.9.5.msysgit.1

--- a/Spigot-Server-Patches/0054-FallingBlock-and-TNT-entities-collide-with-specific-.patch
+++ b/Spigot-Server-Patches/0054-FallingBlock-and-TNT-entities-collide-with-specific-.patch
@ -1,4 +1,4 @@
-From e53196a56adedd249e59f64343d7a790ffb11649 Mon Sep 17 00:00:00 2001
+From f1793ad4101a53ae77153a2bd31594d457222b6a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Fri, 5 Jun 2015 00:43:17 -0700
 Subject: [PATCH] FallingBlock and TNT entities collide with specific blocks
@ -27,10 +27,10 @@ index aec39a8..8258c25 100644
                         }
                     }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 3edd322..3f42ca9 100644
+index 37369e8..0b75e16 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -338,4 +338,10 @@ public class PaperSpigotWorldConfig
+@@ -332,4 +332,10 @@ public class PaperSpigotWorldConfig
         fixCannons = getBoolean( "fix-cannons", false );
         log( "Fix TNT cannons: " + fixCannons );
     }
@ -42,5 +42,5 @@ index 3edd322..3f42ca9 100644
 +    }
 }
 -- 
-2.4.2.windows.1
+1.9.5.msysgit.1

--- a/Spigot-Server-Patches/0056-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0056-Optimize-explosions.patch
@ -1,4 +1,4 @@
-From 506643b86c89a89100e35420d3511c9eb8b9d0a1 Mon Sep 17 00:00:00 2001
+From a33575012a7e963a20618af399f8b60e0d4c4dc0 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 16 Jun 2015 05:52:58 -0700
 Subject: [PATCH] Optimize explosions
@ -134,10 +134,10 @@ index 480a6d8..26091b1 100644
     public static long chunkToKey(int x, int z)
     {
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 3f42ca9..9d8791f 100644
+index 0b75e16..4596e9d 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -344,4 +344,10 @@ public class PaperSpigotWorldConfig
+@@ -338,4 +338,10 @@ public class PaperSpigotWorldConfig
     {
         fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
     }
--- a/Spigot-Server-Patches/0057-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0057-Stop-updating-flowing-block-if-material-has-changed.patch
@ -0,0 +1,21 @@
+From fce49b25739325c050cb843e4394761e9d860562 Mon Sep 17 00:00:00 2001
+From: Iceee <andrew@opticgaming.tv>
+Date: Tue, 30 Jun 2015 19:31:02 -0700
+Subject: [PATCH] Stop updating flowing block if material has changed
+
+
+diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
+index ff18f63..ab2e43f 100644
+--- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
+@@ -102,6 +102,7 @@ public class BlockFlowing extends BlockFluids {
+             this.f(world, blockposition, iblockdata);
+         }
+ 
+        if (world.getType(blockposition).getBlock().getMaterial() != material) return; // PaperSpigot - Stop updating flowing block if material has changed
+         IBlockData iblockdata2 = world.getType(blockposition.down());
+ 
+         if (this.h(world, blockposition.down(), iblockdata2)) {
+-- 
+1.9.5.msysgit.1
+