From 07ff818e53af1e87f1d0c1670becc435a8078c08 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 May 2015 19:24:52 -0500 Subject: [PATCH] Rebuild patches --- .../0004-Vanished-players-don-t-have-rights.patch | 8 ++++---- .../0019-Player-affects-spawning-API.patch | 8 ++++---- .../0023-Optimize-TileEntity-Ticking.patch | 12 +++++++----- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch index 20724a3..a53ae26 100644 --- a/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From 9ed212f5608c2d5592c138d4adf2299440892e92 Mon Sep 17 00:00:00 2001 +From c07179e4c0ba3839530a95a6826f2459cc58ebe0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 19:50:01 -0600 Subject: [PATCH] Vanished players don't have rights @@ -56,10 +56,10 @@ index 451a0bb..24601c7 100644 IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8b08c84..9c98645 100644 +index c9cb7cd..50d4984 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1671,6 +1671,13 @@ public abstract class World implements IBlockAccess { +@@ -1673,6 +1673,13 @@ public abstract class World implements IBlockAccess { for (int i = 0; i < list.size(); ++i) { Entity entity1 = (Entity) list.get(i); @@ -74,5 +74,5 @@ index 8b08c84..9c98645 100644 return false; } -- -1.9.1 +2.4.0.windows.2 diff --git a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch index e759db4..1722cf6 100644 --- a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 031921da8c8f2b9dd9e7afc863b26f61983a873b Mon Sep 17 00:00:00 2001 +From 869dbe46052c9b5bc254f32bac1dfd06e5c005bf Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 7 Mar 2015 22:52:21 -0600 Subject: [PATCH] Player affects spawning API @@ -65,10 +65,10 @@ index aeb0a44..7df5b84 100644 biomebase_biomemeta = worldserver.a(enumcreaturetype, blockposition2); if (biomebase_biomemeta == null) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 32c882e..c563d62 100644 +index 05f9351..cf4bf4e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -3135,4 +3135,50 @@ public abstract class World implements IBlockAccess { +@@ -3137,4 +3137,50 @@ public abstract class World implements IBlockAccess { return k >= -short0 && k <= short0 && l >= -short0 && l <= short0 && this.keepSpawnInMemory; // CraftBukkit - Added 'this.keepSpawnInMemory' } @@ -143,5 +143,5 @@ index 06e014c..5d5f987 100644 public Player.Spigot spigot() -- -2.3.5 +2.4.0.windows.2 diff --git a/Spigot-Server-Patches/0023-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0023-Optimize-TileEntity-Ticking.patch index 4594829..dc21a6e 100644 --- a/Spigot-Server-Patches/0023-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0023-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From 0ed1de26c7933ca520548d35cefc535b278aff93 Mon Sep 17 00:00:00 2001 +From 1ed5764045977352072c7a6d34aee8c824d3fae8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 01:56:22 -0600 Subject: [PATCH] Optimize TileEntity Ticking @@ -74,7 +74,7 @@ index f75e2de..7119612 100644 if (this.e instanceof BlockDaylightDetector) { ((BlockDaylightDetector) this.e).f(this.world, this.position); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c563d62..15fe976 100644 +index cf4bf4e..15fe976 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -65,7 +65,7 @@ public abstract class World implements IBlockAccess { @@ -121,7 +121,7 @@ index c563d62..15fe976 100644 // Spigot start int tilesThisCycle = 0; for (tileLimiter.initTick(); -@@ -1474,10 +1482,12 @@ public abstract class World implements IBlockAccess { +@@ -1474,11 +1482,12 @@ public abstract class World implements IBlockAccess { tileTickPosition++, tilesThisCycle++) { tileTickPosition = (tileTickPosition < tileEntityList.size()) ? tileTickPosition : 0; TileEntity tileentity = (TileEntity) this.tileEntityList.get(tileTickPosition); @@ -130,15 +130,17 @@ index c563d62..15fe976 100644 // Spigot start if (tileentity == null) { getServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash"); +- tilesThisCycle--; - this.tileEntityList.remove(tileTickPosition--); + iterator.remove(); // PaperSpigot - Remove Spigot's TE handling in favor of our own continue; } // Spigot end -@@ -1505,7 +1515,7 @@ public abstract class World implements IBlockAccess { +@@ -1506,8 +1515,7 @@ public abstract class World implements IBlockAccess { } if (tileentity.x()) { +- tilesThisCycle--; - this.tileEntityList.remove(tileTickPosition--); + iterator.remove(); // PaperSpigot - Remove Spigot's TE handling in favor of our own this.h.remove(tileentity); @@ -320,5 +322,5 @@ index 0000000..5af5dcc +} \ No newline at end of file -- -1.9.1 +2.4.0.windows.2