From 729551d7e0c9c529b1126f7c7b192351f9b742ac Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 22 Jun 2019 13:06:08 -0500 Subject: [PATCH] Rebuild patches --- .../0321-Add-sun-related-API.patch | 14 +++++++------- .../0342-Optimize-redstone-algorithm.patch | 16 ++++++++-------- .../0358-BlockDestroyEvent.patch | 8 ++++---- ...381-Optimize-Captured-TileEntity-Lookup.patch | 8 ++++---- .../0382-Add-Heightmap-API.patch | 10 +++++----- .../0399-Implement-CraftBlockSoundGroup.patch | 14 +++++++------- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Spigot-Server-Patches/0321-Add-sun-related-API.patch b/Spigot-Server-Patches/0321-Add-sun-related-API.patch index c21a2fe8c..c9223e2fd 100644 --- a/Spigot-Server-Patches/0321-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0321-Add-sun-related-API.patch @@ -1,11 +1,11 @@ -From 0eb9bc27ad0eacecb69793530ca907e2e9129beb Mon Sep 17 00:00:00 2001 +From de658a99cc0c2fd95317f1a9c12f394aa3dec85f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index c2771c5d94..c81e530902 100644 +index c2771c5d9..c81e53090 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1326,6 +1326,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -17,10 +17,10 @@ index c2771c5d94..c81e530902 100644 if (this.world.J() && !this.world.isClientSide) { float f = this.aE(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d205ec01ac..ce7e019208 100644 +index 05c7a49a4..83e7a65a2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -663,6 +663,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose +@@ -705,6 +705,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose } } @@ -29,7 +29,7 @@ index d205ec01ac..ce7e019208 100644 return this.d < 4; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d4bad21560..f4afddba4d 100644 +index 4b3ea756e..93ddf7eed 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -739,6 +739,13 @@ public class CraftWorld implements World { @@ -47,7 +47,7 @@ index d4bad21560..f4afddba4d 100644 public boolean createExplosion(double x, double y, double z, float power) { return createExplosion(x, y, z, power, false, true); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 53c2d154ed..56c233872b 100644 +index 53c2d154e..56c233872 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { @@ -63,5 +63,5 @@ index 53c2d154ed..56c233872b 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch index 9111e4abb..cd846eb07 100644 --- a/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From c70be437b775f3474b8eea301f826bdaa0e86c9c Mon Sep 17 00:00:00 2001 +From 57c32d7dae8f6be43ba79b6335dfaa929acf3cd2 Mon Sep 17 00:00:00 2001 From: theosib 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 ad793ffa38..ef882b897f 100644 +index ad793ffa3..ef882b897 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -439,4 +439,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index ad793ffa38..ef882b897f 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..cf5661f1c5 +index 000000000..cf5661f1c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,912 @@ @@ -956,7 +956,7 @@ index 0000000000..cf5661f1c5 + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 7ce9cdb853..6b5015ce5f 100644 +index 7ce9cdb85..6b5015ce5 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1124,10 +1124,10 @@ index 7ce9cdb853..6b5015ce5f 100644 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ce7e019208..638b9887c0 100644 +index 83e7a65a2..e35188ef0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -552,6 +552,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose +@@ -594,6 +594,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose } @@ -1135,7 +1135,7 @@ index ce7e019208..638b9887c0 100644 public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) { if (!this.isClientSide) { IBlockData iblockdata = this.getType(blockposition); -@@ -1298,6 +1299,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose +@@ -1340,6 +1341,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose 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)))); } @@ -1144,5 +1144,5 @@ index ce7e019208..638b9887c0 100644 int i = 0; EnumDirection[] aenumdirection = World.a; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0358-BlockDestroyEvent.patch b/Spigot-Server-Patches/0358-BlockDestroyEvent.patch index 8864e6808..0c4b3fea6 100644 --- a/Spigot-Server-Patches/0358-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0358-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 76af5c87dc330880cacfdb3aee255c1800f64bf6 Mon Sep 17 00:00:00 2001 +From 871e60c0c44878e7ad1137fdcb728bc784343ee6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:20:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -11,10 +11,10 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 638b9887c0..988f778f19 100644 +index e35188ef0..0f04860bc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -482,8 +482,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose +@@ -524,8 +524,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose return false; } else { Fluid fluid = this.getFluid(blockposition); @@ -37,5 +37,5 @@ index 638b9887c0..988f778f19 100644 TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? this.getTileEntity(blockposition) : null; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch index 08dd524cb..5b5a29eaa 100644 --- a/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From 3e3f6b8fee442d69ef39806f9bcadfa23b92dea3 Mon Sep 17 00:00:00 2001 +From e883942e00955e4a4caa2e8e8f80169d12beb3c0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Apr 2019 10:16:48 -0400 Subject: [PATCH] Optimize Captured TileEntity Lookup @@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to just do a get call since the value can never be null. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 988f778f19..469d967a43 100644 +index 0f04860bc..a9c5ded5b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1045,12 +1045,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose +@@ -1087,12 +1087,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose return null; } else { // CraftBukkit start @@ -31,5 +31,5 @@ index 988f778f19..469d967a43 100644 if (this.tickingTileEntities) { tileentity = this.B(blockposition); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0382-Add-Heightmap-API.patch b/Spigot-Server-Patches/0382-Add-Heightmap-API.patch index f64484847..29437cf96 100644 --- a/Spigot-Server-Patches/0382-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0382-Add-Heightmap-API.patch @@ -1,14 +1,14 @@ -From 59dc13104d3b06257423b26eb006736b1b60fad7 Mon Sep 17 00:00:00 2001 +From ef721ff30a757fd89c12f4626722aa0d975c7cd1 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 1 Jan 2019 02:22:01 -0800 Subject: [PATCH] Add Heightmap API diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 469d967a43..78bae25255 100644 +index a9c5ded5b..67b155c19 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -621,8 +621,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose +@@ -663,8 +663,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose } } @@ -20,7 +20,7 @@ index 469d967a43..78bae25255 100644 if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f4afddba4d..fa4142c824 100644 +index 93ddf7eed..5531000a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -317,6 +317,29 @@ public class CraftWorld implements World { @@ -54,5 +54,5 @@ index f4afddba4d..fa4142c824 100644 public Location getSpawnLocation() { BlockPosition spawn = world.getSpawn(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0399-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0399-Implement-CraftBlockSoundGroup.patch index ca6b40804..bc7d64acd 100644 --- a/Spigot-Server-Patches/0399-Implement-CraftBlockSoundGroup.patch +++ b/Spigot-Server-Patches/0399-Implement-CraftBlockSoundGroup.patch @@ -1,4 +1,4 @@ -From 5e6fa7c835d641e2c12a627dde911889df8a9041 Mon Sep 17 00:00:00 2001 +From 9642d31817141f5aeef13d682b55163ceeafd935 Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:48:51 -0700 Subject: [PATCH] Implement CraftBlockSoundGroup @@ -6,7 +6,7 @@ Subject: [PATCH] Implement CraftBlockSoundGroup diff --git a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java new file mode 100644 -index 0000000000..99f99330d0 +index 000000000..99f99330d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java @@ -0,0 +1,38 @@ @@ -49,10 +49,10 @@ index 0000000000..99f99330d0 + } +} diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index c66cabe82f..709cc3d768 100644 +index c0ba80d7b..3ae1b7df5 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java -@@ -266,6 +266,7 @@ public class IBlockData extends BlockDataAbstract implements +@@ -267,6 +267,7 @@ public class IBlockData extends BlockDataAbstract implements return this.getBlock().isTicking(this); } @@ -61,7 +61,7 @@ index c66cabe82f..709cc3d768 100644 return this.getBlock().getStepSound(this); } diff --git a/src/main/java/net/minecraft/server/SoundEffectType.java b/src/main/java/net/minecraft/server/SoundEffectType.java -index 5460d409b7..ccd5b0529a 100644 +index 5460d409b..ccd5b0529 100644 --- a/src/main/java/net/minecraft/server/SoundEffectType.java +++ b/src/main/java/net/minecraft/server/SoundEffectType.java @@ -26,10 +26,10 @@ public class SoundEffectType { @@ -96,7 +96,7 @@ index 5460d409b7..ccd5b0529a 100644 return this.C; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 166c918d73..5296c6d9bf 100644 +index 166c918d7..5296c6d9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -689,4 +689,11 @@ public class CraftBlock implements Block { @@ -112,5 +112,5 @@ index 166c918d73..5296c6d9bf 100644 + // Paper end } -- -2.21.0 +2.22.0