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 1c6300844f..d724870e58 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 ff5d1b285c7dc4e6bd78a27173dd81c369a5da4d Mon Sep 17 00:00:00 2001 +From 748dbbdcd8b0f5a6cda6d1e4366c361324f20676 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 6052137..2920d56 100644 +index e071cbf..6b77fda 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1669,6 +1669,14 @@ public abstract class World implements IBlockAccess { +@@ -1670,6 +1670,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/0021-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0021-Player-affects-spawning-API.patch index fcd2ed469b..aeb727d5f5 100644 --- a/Spigot-Server-Patches/0021-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0021-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From cb66a69be962f8aeeca6af180305442dc985c027 Mon Sep 17 00:00:00 2001 +From 2562f17c456e63f56623f6d936a4bc4cb762892f 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 60cdf2e..26f4d96 100644 +index 76da3e6..4e1d779 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 60cdf2e..26f4d96 100644 import org.bukkit.craftbukkit.SpigotTimings; // Spigot import org.bukkit.generator.ChunkGenerator; import org.bukkit.craftbukkit.CraftServer; -@@ -2769,6 +2767,50 @@ public abstract class World implements IBlockAccess { +@@ -2770,6 +2768,50 @@ public abstract class World implements IBlockAccess { return false; } diff --git a/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch index a8f62cd9b2..9e894c26be 100644 --- a/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From a54f2fe608b2d5ccbc117dec28be3531eda48ca5 Mon Sep 17 00:00:00 2001 +From 6592278669315ae213de6950d84a5adb7a01456f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Nov 2014 04:14:14 -0600 Subject: [PATCH] Optimize TileEntity Ticking @@ -74,7 +74,7 @@ index 7b6f8ae..c6b593f 100644 if (this.e instanceof BlockDaylightDetector) { ((BlockDaylightDetector) this.e).d(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 26f4d96..7730e2c 100644 +index 4e1d779..7622a92 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -3,13 +3,7 @@ package net.minecraft.server; @@ -121,7 +121,7 @@ index 26f4d96..7730e2c 100644 } public World b() { -@@ -1462,7 +1456,12 @@ public abstract class World implements IBlockAccess { +@@ -1463,7 +1457,12 @@ public abstract class World implements IBlockAccess { // CraftBukkit end this.initializeHoppers(); // Spigot - Initializes hoppers which have been added recently. @@ -134,7 +134,7 @@ index 26f4d96..7730e2c 100644 // Spigot start int tilesThisCycle = 0; for (tileLimiter.initTick(); -@@ -1470,10 +1469,12 @@ public abstract class World implements IBlockAccess { +@@ -1471,10 +1470,12 @@ public abstract class World implements IBlockAccess { tileTickPosition++, tilesThisCycle++) { tileTickPosition = (tileTickPosition < tileEntityList.size()) ? tileTickPosition : 0; TileEntity tileentity = (TileEntity) this.tileEntityList.get(tileTickPosition); @@ -148,7 +148,7 @@ index 26f4d96..7730e2c 100644 continue; } // Spigot end -@@ -1501,7 +1502,7 @@ public abstract class World implements IBlockAccess { +@@ -1502,7 +1503,7 @@ public abstract class World implements IBlockAccess { } if (tileentity.x()) { diff --git a/Spigot-Server-Patches/0027-Remove-specific-entities-that-fly-through-an-unloade.patch b/Spigot-Server-Patches/0027-Remove-specific-entities-that-fly-through-an-unloade.patch index fccb5f1e38..5209c0ea52 100644 --- a/Spigot-Server-Patches/0027-Remove-specific-entities-that-fly-through-an-unloade.patch +++ b/Spigot-Server-Patches/0027-Remove-specific-entities-that-fly-through-an-unloade.patch @@ -1,4 +1,4 @@ -From 2ac679151195e7aa1b660fde7949474282daee34 Mon Sep 17 00:00:00 2001 +From 9d9bcf820969779811228b510941018104dae591 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,7 +70,7 @@ index 3621faf..287039c 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 7730e2c..1933f5f 100644 +index 7622a92..e2988a0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1158,6 +1158,7 @@ public abstract class World implements IBlockAccess { @@ -81,7 +81,7 @@ index 7730e2c..1933f5f 100644 continue; } int cz = chunkz << 4; -@@ -1590,6 +1591,14 @@ public abstract class World implements IBlockAccess { +@@ -1591,6 +1592,14 @@ public abstract class World implements IBlockAccess { if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { entity.ticksLived++; entity.inactiveTick(); diff --git a/Spigot-Server-Patches/0039-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0039-Prevent-tile-entity-and-entity-crashes.patch index a91cfba09c..8b78405c32 100644 --- a/Spigot-Server-Patches/0039-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0039-Prevent-tile-entity-and-entity-crashes.patch @@ -1,4 +1,4 @@ -From 7b7a341c8b247ccffd179d4c79580701592fffef Mon Sep 17 00:00:00 2001 +From bacdc44538b85985c04e459b6d83e2abfd62c80f 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 1933f5f..e4a1bb2 100644 +index e2988a0..3ea9c92 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1418,10 +1418,13 @@ public abstract class World implements IBlockAccess { +@@ -1419,10 +1419,13 @@ public abstract class World implements IBlockAccess { this.g(entity); SpigotTimings.tickEntityTimer.stopTiming(); // Spigot } catch (Throwable throwable1) { @@ -45,7 +45,7 @@ index 1933f5f..e4a1bb2 100644 } } -@@ -1488,11 +1491,13 @@ public abstract class World implements IBlockAccess { +@@ -1489,11 +1492,13 @@ public abstract class World implements IBlockAccess { tileentity.tickTimer.startTiming(); // Spigot ((IUpdatePlayerListBox) tileentity).c(); } catch (Throwable throwable2) { diff --git a/Spigot-Server-Patches/0042-PaperSpigot-TNT-Changes.patch b/Spigot-Server-Patches/0042-PaperSpigot-TNT-Changes.patch index 055659be00..2d6564cb2a 100644 --- a/Spigot-Server-Patches/0042-PaperSpigot-TNT-Changes.patch +++ b/Spigot-Server-Patches/0042-PaperSpigot-TNT-Changes.patch @@ -1,4 +1,4 @@ -From 825d2eb3b84c72194294491432a5f3625315ed31 Mon Sep 17 00:00:00 2001 +From a67ca6c100a61600fa215e1b6b0872bc62ebdd4a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 23 Feb 2015 15:54:17 -0600 Subject: [PATCH] PaperSpigot TNT Changes @@ -67,10 +67,10 @@ index ddff5a8..7c94d99 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e4a1bb2..7bac43c 100644 +index 3ea9c92..5deeb76 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1888,6 +1888,11 @@ public abstract class World implements IBlockAccess { +@@ -1889,6 +1889,11 @@ 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); @@ -82,7 +82,7 @@ index e4a1bb2..7bac43c 100644 if (d0 >= 0.0D && d1 >= 0.0D && d2 >= 0.0D) { int i = 0; int j = 0; -@@ -1899,7 +1904,16 @@ public abstract class World implements IBlockAccess { +@@ -1900,7 +1905,16 @@ 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; @@ -101,7 +101,7 @@ index e4a1bb2..7bac43c 100644 } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index a756395..b2d8a03 100644 +index a756395..720b4a7 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -191,4 +191,36 @@ public class PaperSpigotWorldConfig