diff options
Diffstat (limited to 'Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch')
| -rw-r--r-- | Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch index 08411d286c..93e6da3db7 100644 --- a/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 6e73e08568141499f1c97c1574d249495b32a2cf Mon Sep 17 00:00:00 2001 +From 1a5d05cb2c1a7eda1f6eec4a99175f40f1fbc001 Mon Sep 17 00:00:00 2001 From: theosib <[email protected]> Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 61ad2cef7b..a70a64070e 100644 +index 61ad2cef7..a70a64070 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -588,4 +588,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 61ad2cef7b..a70a64070e 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java new file mode 100644 -index 0000000000..21d9d6d7ed +index 000000000..21d9d6d7e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,910 @@ @@ -954,7 +954,7 @@ index 0000000000..21d9d6d7ed + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 2e30270bb7..72d2617071 100644 +index 2e30270bb..72d261707 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1122,7 +1122,7 @@ index 2e30270bb7..72d2617071 100644 iblockdata.a(world, blockposition, 0); world.setAir(blockposition); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 027bb64acc..645af17a58 100644 +index 94e189a55..d790fd89f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -648,6 +648,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -1133,7 +1133,7 @@ index 027bb64acc..645af17a58 100644 public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) { if (!this.isClientSide) { IBlockData iblockdata = this.getType(blockposition); -@@ -2593,6 +2594,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc +@@ -2592,6 +2593,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0)))); } |