From ba4cb3003ec3c013c9dabc8415409d2c5acb3900 Mon Sep 17 00:00:00 2001 From: Automated Date: Tue, 5 Mar 2019 00:46:37 -0500 Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: f102d882 SPIGOT-4647: Properly cancel VehicleDamageEvent ec17d07d Use getBukkitEntity for ExplosionPrimeEvent instead of creating new one --- Spigot-Server-Patches/Entity-Origin-API.patch | 4 ++-- .../Optional-TNT-doesn-t-move-in-water.patch | 6 +++--- work/CraftBukkit | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Spigot-Server-Patches/Entity-Origin-API.patch b/Spigot-Server-Patches/Entity-Origin-API.patch index 941ba8de3..95000f69f 100644 --- a/Spigot-Server-Patches/Entity-Origin-API.patch +++ b/Spigot-Server-Patches/Entity-Origin-API.patch @@ -70,7 +70,7 @@ index a6eae266d..489dd861d 100644 public void a(boolean flag) { diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 5dc52b6b8..2c28633c4 100644 +index 8c19278f3..7f4b68dcc 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 { @@ -101,7 +101,7 @@ index 27debcfca..22027321b 100644 if (i >= 0 && i < this.list.size()) { NBTBase nbtbase = (NBTBase) this.list.get(i); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 10c8ece94..7e73e00ce 100644 +index 73014cd35..da29880db 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc 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 1153cdd38..9602bfd4c 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 00f0451ef8..42d9515542 100644 +index 00f0451ef..42d951554 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 00f0451ef8..42d9515542 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d004f7e620..a2e795bc28 100644 +index d004f7e62..a2e795bc2 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 INamableTileEntity, ICommandListener, Ke @@ -61,7 +61,7 @@ index d004f7e620..a2e795bc28 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 2c28633c42..e5170b4e6b 100644 +index 7f4b68dcc..7a8670323 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/work/CraftBukkit b/work/CraftBukkit index 0f708cbf5..f102d8829 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 0f708cbf516c53a31e2ebfedfd2ef85c3dbfab54 +Subproject commit f102d882996f7409efc2a0cc5e70a583d901097d