diff --git a/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch index 6c5febcf3f..91abc63028 100644 --- a/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From c3c56b603e7a6e484edc30051a35ec44d8e4ce24 Mon Sep 17 00:00:00 2001 +From 0f4dbfcd170e17ed498637c063566c560264c8f6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities @@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8aba80c07..9bd55e6a4 100644 +index 58a882e27..9e0bceea9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2344,7 +2344,7 @@ public abstract class Entity implements ICommandListener { +@@ -2349,7 +2349,7 @@ public abstract class Entity implements ICommandListener { } public Entity teleportTo(Location exit, boolean portal) { @@ -20,5 +20,5 @@ index 8aba80c07..9bd55e6a4 100644 WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle(); int i = worldserver1.dimension; -- -2.13.2 +2.13.3.windows.1 diff --git a/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch index 582a98a393..e175fe0512 100644 --- a/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch @@ -1,11 +1,11 @@ -From 83804921daabb244c27992872803e17551968483 Mon Sep 17 00:00:00 2001 +From cc02e620cc6f56d0590582453284e3a608835d11 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional TNT doesn't move in water diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index fbe769eb..d2a54235 100644 +index fbe769eb3..d2a542354 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,7 +2,6 @@ package com.destroystokyo.paper; @@ -32,7 +32,7 @@ index fbe769eb..d2a54235 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7fb23be6..e78b1c26 100644 +index 4a6c5ff73..73507cda8 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1108,6 +1108,11 @@ public abstract class Entity implements ICommandListener { @@ -47,7 +47,7 @@ index 7fb23be6..e78b1c26 100644 if (this.bJ() instanceof EntityBoat) { this.inWater = false; } else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) { -@@ -2532,6 +2537,11 @@ public abstract class Entity implements ICommandListener { +@@ -2537,6 +2542,11 @@ public abstract class Entity implements ICommandListener { } public boolean bo() { @@ -60,7 +60,7 @@ index 7fb23be6..e78b1c26 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index bb0904f8..50811852 100644 +index bb0904f86..50811852a 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity { @@ -114,5 +114,5 @@ index bb0904f8..50811852 100644 + // Paper end } -- -2.13.1.windows.2 +2.13.3.windows.1 diff --git a/Spigot-Server-Patches/0212-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0212-provide-a-configurable-option-to-disable-creeper-lin.patch index 2a9c0645b6..ea4a9059c9 100644 --- a/Spigot-Server-Patches/0212-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/Spigot-Server-Patches/0212-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -1,4 +1,4 @@ -From 34b1a9cae5899eb3eeec50ae9f1a408b67d643ac Mon Sep 17 00:00:00 2001 +From 7c3ffd3a5824fbccf2b98e41e73adfbb1d460b45 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Jun 2017 21:01:18 +0100 Subject: [PATCH] provide a configurable option to disable creeper lingering @@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1ce3aaa8..54d081fd 100644 +index 1ce3aaa8c..54d081fd2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -422,4 +422,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 1ce3aaa8..54d081fd 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 4a5e87b5..6a653f8b 100644 +index 01e9ddc3d..b9580c65c 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -222,7 +222,7 @@ public class EntityCreeper extends EntityMonster { @@ -32,7 +32,7 @@ index 4a5e87b5..6a653f8b 100644 + if (!collection.isEmpty() && !world.paperConfig.disableCreeperLingeringEffect) { // Paper EntityAreaEffectCloud entityareaeffectcloud = new EntityAreaEffectCloud(this.world, this.locX, this.locY, this.locZ); - entityareaeffectcloud.setRadius(2.5F); + entityareaeffectcloud.setSource(this); // CraftBukkit -- -2.13.1.windows.2 +2.13.3.windows.1 diff --git a/work/CraftBukkit b/work/CraftBukkit index 9a82fa7785..f078eed54b 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 9a82fa7785843e56b8799ca2b495b0ce115d79d6 +Subproject commit f078eed54b23d480eacb0b6f50b1468d5c8c81c5