mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-01 12:42:05 -07:00
Stop updating flowing block if material has changed
This commit is contained in:
@@ -345,4 +345,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ log( "Fix TNT cannons: " + fixCannons );
|
+ log( "Fix TNT cannons: " + fixCannons );
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
@@ -78,8 +78,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
||||||
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
||||||
@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
|
@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
|
||||||
{
|
useAsyncLighting = getBoolean( "use-async-lighting", false );
|
||||||
optimizeDraining = getBoolean( "optimize-draining", false );
|
log( "World async lighting: " + useAsyncLighting );
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ public boolean disableEndCredits;
|
+ public boolean disableEndCredits;
|
||||||
@@ -88,4 +88,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ disableEndCredits = getBoolean( "game-mechanics.disable-end-credits", false );
|
+ disableEndCredits = getBoolean( "game-mechanics.disable-end-credits", false );
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
@@ -41,4 +41,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
|
+ fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
@@ -168,4 +168,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
SpigotTimings.checkIfActiveTimer.stopTiming();
|
SpigotTimings.checkIfActiveTimer.stopTiming();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
@@ -275,4 +275,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ generateFlatBedrock = getBoolean( "generator-settings.flat-bedrock", false );
|
+ generateFlatBedrock = getBoolean( "generator-settings.flat-bedrock", false );
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
1.9.5.msysgit.1
|
||||||
|
|
||||||
|
@@ -0,0 +1,21 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/BlockFlowing.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
|
||||||
|
@@ -0,0 +0,0 @@ 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
|
||||||
|
|
Reference in New Issue
Block a user