diff --git a/Spigot-Server-Patches/0005-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0005-Vanished-players-don-t-have-rights.patch index 4beba0036..1c6300844 100644 --- a/Spigot-Server-Patches/0005-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0005-Vanished-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From e5fe004e7cdd8231eeefdfa9b380c94a809f96b4 Mon Sep 17 00:00:00 2001 +From ff5d1b285c7dc4e6bd78a27173dd81c369a5da4d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 28 Nov 2014 00:35:56 -0600 Subject: [PATCH] Vanished players don't have rights @@ -56,10 +56,10 @@ index a4b50fe..14ea66d 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 ac11b9a..bebf181 100644 +index 6052137..2920d56 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1656,6 +1656,14 @@ public abstract class World implements IBlockAccess { +@@ -1669,6 +1669,14 @@ public abstract class World implements IBlockAccess { for (int i = 0; i < list.size(); ++i) { Entity entity1 = (Entity) list.get(i); diff --git a/Spigot-Server-Patches/0019-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0019-Allow-for-toggling-of-spawn-chunks.patch index bb59530c0..e61928426 100644 --- a/Spigot-Server-Patches/0019-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0019-Allow-for-toggling-of-spawn-chunks.patch @@ -1,14 +1,14 @@ -From b430bd06929b4b872c2c1dfd006f01d2eabb1c68 Mon Sep 17 00:00:00 2001 +From ee72aae8f02c2bb498dac033036a830b7feaf0fe Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Fri, 28 Nov 2014 01:53:14 -0600 Subject: [PATCH] Allow for toggling of spawn chunks diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bebf181..66e85cb 100644 +index 2920d56..ba37e02 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -216,6 +216,7 @@ public abstract class World implements IBlockAccess { +@@ -219,6 +219,7 @@ public abstract class World implements IBlockAccess { this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit // CraftBukkit end diff --git a/Spigot-Server-Patches/0022-Center-TNT-grid-sample-points.patch b/Spigot-Server-Patches/0022-Center-TNT-grid-sample-points.patch index d0b9dc2cc..6e289800d 100644 --- a/Spigot-Server-Patches/0022-Center-TNT-grid-sample-points.patch +++ b/Spigot-Server-Patches/0022-Center-TNT-grid-sample-points.patch @@ -1,14 +1,14 @@ -From 4b0c6d3e028d76d272577216484f7db0217e4a3d Mon Sep 17 00:00:00 2001 +From 01e10685a9d781cec3a70951baa46b907202a29a Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 28 Nov 2014 02:36:18 -0600 Subject: [PATCH] Center TNT grid sample points diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 66e85cb..186d25d 100644 +index ba37e02..22a8b59 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1862,6 +1862,12 @@ public abstract class World implements IBlockAccess { +@@ -1875,6 +1875,12 @@ public abstract class World implements IBlockAccess { double d1 = 1.0D / ((axisalignedbb.e - axisalignedbb.b) * 2.0D + 1.0D); double d2 = 1.0D / ((axisalignedbb.f - axisalignedbb.c) * 2.0D + 1.0D); @@ -21,7 +21,7 @@ index 66e85cb..186d25d 100644 if (d0 >= 0.0D && d1 >= 0.0D && d2 >= 0.0D) { int i = 0; int j = 0; -@@ -1873,7 +1879,7 @@ public abstract class World implements IBlockAccess { +@@ -1886,7 +1892,7 @@ public abstract class World implements IBlockAccess { double d4 = axisalignedbb.b + (axisalignedbb.e - axisalignedbb.b) * (double) f1; double d5 = axisalignedbb.c + (axisalignedbb.f - axisalignedbb.c) * (double) f2; diff --git a/Spigot-Server-Patches/0023-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0023-Player-affects-spawning-API.patch index 87ef01cb7..af430dec0 100644 --- a/Spigot-Server-Patches/0023-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0023-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 0bf41c7610e071565fed7b0691a5a581a315ec93 Mon Sep 17 00:00:00 2001 +From 8bc83195afec263e5e6e5a72d87f1d0a98348749 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 28 Nov 2014 03:31:21 -0600 Subject: [PATCH] Player affects spawning API @@ -67,7 +67,7 @@ index 43954b3..932a572 100644 biomemeta = worldserver.a(enumcreaturetype, blockposition2); if (biomemeta == null) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 186d25d..fa68938 100644 +index 22a8b59..a105351 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,14 +2,13 @@ package net.minecraft.server; @@ -94,7 +94,7 @@ index 186d25d..fa68938 100644 import org.bukkit.craftbukkit.SpigotTimings; // Spigot import org.bukkit.generator.ChunkGenerator; import org.bukkit.craftbukkit.CraftServer; -@@ -2762,6 +2760,50 @@ public abstract class World implements IBlockAccess { +@@ -2775,6 +2773,50 @@ public abstract class World implements IBlockAccess { return false; } diff --git a/Spigot-Server-Patches/0029-Remove-specific-entities-that-fly-through-an-unloade.patch b/Spigot-Server-Patches/0029-Remove-specific-entities-that-fly-through-an-unloade.patch index 2904f417f..33b9e663b 100644 --- a/Spigot-Server-Patches/0029-Remove-specific-entities-that-fly-through-an-unloade.patch +++ b/Spigot-Server-Patches/0029-Remove-specific-entities-that-fly-through-an-unloade.patch @@ -1,4 +1,4 @@ -From 1b38ac93e5234cf9ec8ab18f0706d5be2f0f89e6 Mon Sep 17 00:00:00 2001 +From 9698258d27c861c74452db8fd49fa728ea4dd532 Mon Sep 17 00:00:00 2001 From: Iceee Date: Fri, 28 Nov 2014 12:11:03 -0600 Subject: [PATCH] Remove specific entities that fly through an unloaded chunk @@ -70,10 +70,10 @@ index 4823698..7b856ef 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7507580..72b9a2a 100644 +index 753865f..51f3d8a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1153,6 +1153,7 @@ public abstract class World implements IBlockAccess { +@@ -1158,6 +1158,7 @@ public abstract class World implements IBlockAccess { { if ( !this.isChunkLoaded( chunkx, chunkz, true ) ) { @@ -81,7 +81,7 @@ index 7507580..72b9a2a 100644 continue; } int cz = chunkz << 4; -@@ -1570,6 +1571,14 @@ public abstract class World implements IBlockAccess { +@@ -1583,6 +1584,14 @@ public abstract class World implements IBlockAccess { if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { entity.ticksLived++; entity.inactiveTick(); diff --git a/Spigot-Server-Patches/0042-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0042-Prevent-tile-entity-and-entity-crashes.patch index 76326d499..8cc35d373 100644 --- a/Spigot-Server-Patches/0042-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0042-Prevent-tile-entity-and-entity-crashes.patch @@ -1,4 +1,4 @@ -From 97ce812e9c70d3c91d638741c498a98d95d9f0ac Mon Sep 17 00:00:00 2001 +From eb00fa1302dd89b00cad3ef3173925be55487710 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 3 Jul 2013 08:29:26 -0400 Subject: [PATCH] Prevent tile entity and entity crashes @@ -24,10 +24,10 @@ index 76cdc7e..d976515 100644 crashreportsystemdetails.a("Actual block data value", (Callable) (new CrashReportTileEntityData(this))); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 72b9a2a..b89e3f2 100644 +index 51f3d8a..82f2e9e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1409,10 +1409,13 @@ public abstract class World implements IBlockAccess { +@@ -1418,10 +1418,13 @@ public abstract class World implements IBlockAccess { this.g(entity); SpigotTimings.tickEntityTimer.stopTiming(); // Spigot } catch (Throwable throwable1) { @@ -45,7 +45,7 @@ index 72b9a2a..b89e3f2 100644 } } -@@ -1468,11 +1471,13 @@ public abstract class World implements IBlockAccess { +@@ -1481,11 +1484,13 @@ public abstract class World implements IBlockAccess { tileentity.tickTimer.startTiming(); // Spigot ((IUpdatePlayerListBox) tileentity).c(); } catch (Throwable throwable2) {