From 88205cd8fe5401c39010f4952736bc4dd3849b2b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 25 Jan 2017 22:27:42 -0600 Subject: [PATCH] Update upstream B/CB/S --- ...orldBorder-isInBounds-Location-check.patch | 18 +++++++------ ...chunks-are-slime-spawn-chunks-toggle.patch | 10 ++++---- .../0166-Add-EntityZapEvent.patch | 6 ++--- ...patch => 0208-Cap-Entity-Collisions.patch} | 10 ++++---- ...rldBorder-isInBounds-Location-method.patch | 25 ------------------- ...ow-a-zero-max-height-in-BiomeJungle.patch} | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 9 files changed, 28 insertions(+), 49 deletions(-) rename Spigot-Server-Patches/{0209-Cap-Entity-Collisions.patch => 0208-Cap-Entity-Collisions.patch} (93%) delete mode 100644 Spigot-Server-Patches/0208-Expose-WorldBorder-isInBounds-Location-method.patch rename Spigot-Server-Patches/{0210-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch => 0209-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch} (96%) diff --git a/Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch index 61b8625cd..ccab7a2a0 100644 --- a/Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch +++ b/Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch @@ -1,17 +1,17 @@ -From 2929553345386ced98bef0739339bed732757880 Mon Sep 17 00:00:00 2001 +From 3f1104eade7370f1304f56444a1b5e0d694ada62 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 21 Jan 2017 17:03:10 -0600 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java -index 55c8983b..1957507c 100644 +index 4dc18ed..41b7fae 100644 --- a/src/main/java/org/bukkit/WorldBorder.java +++ b/src/main/java/org/bukkit/WorldBorder.java -@@ -106,4 +106,14 @@ public interface WorldBorder { - * @param distance The distance in blocks. (The default is 5 blocks.) +@@ -114,4 +114,18 @@ public interface WorldBorder { + * @return if this location is inside the border or not */ - public void setWarningDistance(int distance); + public boolean isInside(Location location); + + // Paper start + /** @@ -19,10 +19,14 @@ index 55c8983b..1957507c 100644 + * + * @param location specific location to check + * @return true if the location is within the bounds of this border, false otherwise. ++ * @deprecated use {@link #isInside(Location)} for an upstream compatible replacement + */ -+ public boolean isInBounds(Location location); ++ @Deprecated ++ public default boolean isInBounds(Location location) { ++ return this.isInside(location); ++ } + // Paper end } -- -2.11.0.windows.3 +2.9.3 diff --git a/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch index de4d2e766..d44430672 100644 --- a/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch +++ b/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch @@ -1,4 +1,4 @@ -From 96963b668d65bac53132de642fa2e1b3c1b5c967 Mon Sep 17 00:00:00 2001 +From ac4241971063c677b4d465da7fef9a383fd37de5 Mon Sep 17 00:00:00 2001 From: vemacs Date: Thu, 3 Mar 2016 01:19:22 -0600 Subject: [PATCH] All chunks are slime spawn chunks toggle @@ -19,16 +19,16 @@ index 97265b9..b2c45c8 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 91ed719..950f07d 100644 +index 8fb14d6..c68429f 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -252,7 +252,8 @@ public class EntitySlime extends EntityInsentient implements IMonster { return super.cM(); } -- if (this.random.nextInt(10) == 0 && chunk.a(987234911L).nextInt(10) == 0 && this.locY < 40.0D) { -+ boolean isSlimeChunk = world.paperConfig.allChunksAreSlimeChunks || chunk.a(987234911L).nextInt(10) == 0; // Paper -+ if (this.random.nextInt(10) == 0 && isSlimeChunk && this.locY < 40.0D) { +- if (this.random.nextInt(10) == 0 && chunk.a(world.spigotConfig.slimeSeed).nextInt(10) == 0 && this.locY < 40.0D) { // Spigot ++ boolean isSlimeChunk = world.paperConfig.allChunksAreSlimeChunks || chunk.a(world.spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper ++ if (this.random.nextInt(10) == 0 && isSlimeChunk && this.locY < 40.0D) { // Paper return super.cM(); } } diff --git a/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch index 12828edb0..efd6c48f8 100644 --- a/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0166-Add-EntityZapEvent.patch @@ -1,14 +1,14 @@ -From 7bc75b32c14bfe88a4f0c1ffd8bcf9b1fb86da63 Mon Sep 17 00:00:00 2001 +From e9c16b86b3ae078759e9a7a5a4306cd870214d0e Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 813e18b..691871b 100644 +index 88bd674..80ad25c 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java -@@ -158,6 +158,12 @@ public class EntityPig extends EntityAnimal { +@@ -159,6 +159,12 @@ public class EntityPig extends EntityAnimal { if (!this.world.isClientSide && !this.dead) { EntityPigZombie entitypigzombie = new EntityPigZombie(this.world); diff --git a/Spigot-Server-Patches/0209-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0208-Cap-Entity-Collisions.patch similarity index 93% rename from Spigot-Server-Patches/0209-Cap-Entity-Collisions.patch rename to Spigot-Server-Patches/0208-Cap-Entity-Collisions.patch index d6e37c464..4bebbba1d 100644 --- a/Spigot-Server-Patches/0209-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0208-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 0c2554509dd07cb7f7218cbbbd604c320fd5fba8 Mon Sep 17 00:00:00 2001 +From c377f831fbdaded7826daaca9b5ca25741c705ce Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped. You can set this to 0 to disable collisions. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e8762c487..dba1c477e 100644 +index e8762c4..dba1c47 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -414,4 +414,10 @@ public class PaperWorldConfig { @@ -27,7 +27,7 @@ index e8762c487..dba1c477e 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a1d2233ba..37dc29f63 100644 +index a1d2233..37dc29f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -168,6 +168,7 @@ public abstract class Entity implements ICommandListener { @@ -39,7 +39,7 @@ index a1d2233ba..37dc29f63 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 07688b1ce..6ac6a4062 100644 +index 07688b1..6ac6a40 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2132,8 +2132,11 @@ public abstract class EntityLiving extends Entity { @@ -56,5 +56,5 @@ index 07688b1ce..6ac6a4062 100644 this.C(entity); } -- -2.11.0 +2.9.3 diff --git a/Spigot-Server-Patches/0208-Expose-WorldBorder-isInBounds-Location-method.patch b/Spigot-Server-Patches/0208-Expose-WorldBorder-isInBounds-Location-method.patch deleted file mode 100644 index 9f0cd470d..000000000 --- a/Spigot-Server-Patches/0208-Expose-WorldBorder-isInBounds-Location-method.patch +++ /dev/null @@ -1,25 +0,0 @@ -From acd9810ba659a1ae7c37cdeaa5b45fa0a1b79ce6 Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Sat, 21 Jan 2017 16:58:09 -0600 -Subject: [PATCH] Expose WorldBorder#isInBounds(Location) method - - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java b/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java -index e5395a1cc..92b738c2b 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java -@@ -108,4 +108,11 @@ public class CraftWorldBorder implements WorldBorder { - public void setWarningDistance(int distance) { - this.handle.setWarningDistance(distance); - } -+ -+ // Paper start -+ @Override -+ public boolean isInBounds(Location location) { -+ return this.handle.isInBounds(new net.minecraft.server.BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ())); -+ } -+ // Paper end - } --- -2.11.0.windows.3 - diff --git a/Spigot-Server-Patches/0210-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0209-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch similarity index 96% rename from Spigot-Server-Patches/0210-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch rename to Spigot-Server-Patches/0209-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch index a39e1a5af..562a6cbc4 100644 --- a/Spigot-Server-Patches/0210-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch +++ b/Spigot-Server-Patches/0209-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch @@ -1,4 +1,4 @@ -From 41ca8dd50089527afea998348956e692c684c93f Mon Sep 17 00:00:00 2001 +From 0f97a18ec8df436c8e28873ed645dbd184456a29 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 23 Jan 2017 15:10:25 -0600 Subject: [PATCH] Do not allow a zero max height in BiomeJungle diff --git a/work/Bukkit b/work/Bukkit index 4bef447a0..50702e72b 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 4bef447a073792a0858dc49e33593acb1c1948f5 +Subproject commit 50702e72bc019590101e6c47b14b42db33de46a9 diff --git a/work/CraftBukkit b/work/CraftBukkit index 4d3bf2015..16b5116c7 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 4d3bf2015504897fc69af2a209d4c8bbe217394d +Subproject commit 16b5116c7c528a99a4270324fa05133852ff6bf4 diff --git a/work/Spigot b/work/Spigot index b32c8f871..6de2fbc33 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit b32c8f871b2da575c1d9e9fa0532ba3e7e2eaa54 +Subproject commit 6de2fbc3377792b16f704e188aa34e72ce460354