From 9115bf4ca0ad0a270cf826ac38a324f998638212 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 22 Jul 2017 20:16:06 -0500
Subject: [PATCH] Update upstream CB

---
 Spigot-Server-Patches/Don-t-teleport-dead-entities.patch    | 2 +-
 .../Optional-TNT-doesn-t-move-in-water.patch                | 6 +++---
 ...ovide-a-configurable-option-to-disable-creeper-lin.patch | 6 +++---
 work/CraftBukkit                                            | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Spigot-Server-Patches/Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/Don-t-teleport-dead-entities.patch
index 84b0649aca..5d80695d40 100644
--- a/Spigot-Server-Patches/Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/Don-t-teleport-dead-entities.patch
@@ -7,7 +7,7 @@ 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
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/Optional-TNT-doesn-t-move-in-water.patch
index c92844208c..faec30d368 100644
--- a/Spigot-Server-Patches/Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/Optional-TNT-doesn-t-move-in-water.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
@@ -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
 @@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
diff --git a/Spigot-Server-Patches/provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/provide-a-configurable-option-to-disable-creeper-lin.patch
index 73a16881cf..7ab62e9607 100644
--- a/Spigot-Server-Patches/provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster {
@@ -32,5 +32,5 @@ 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
 --
\ No newline at end of file
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