From 9aba83bfdc4881b25bef18978867e242dc359d82 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Mon, 10 Apr 2017 22:11:26 -0500 Subject: [PATCH] Update upstream CB/S --- ...d-configurable-despawn-distances-for-living-entiti.patch | 2 +- Spigot-Server-Patches/Add-exception-reporting-event.patch | 2 +- Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch | 2 +- .../Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch | 6 +++--- Spigot-Server-Patches/Player-affects-spawning-API.patch | 4 ++-- work/CraftBukkit | 2 +- work/Spigot | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch index 55b60f2b0b..9af72defaf 100644 --- a/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch @@ -30,7 +30,7 @@ index 5f13fbff3..4b64ccaa0 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 59654bcc9..21f5df3c0 100644 +index c23bd2e9b..a9e3b632b 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/Spigot-Server-Patches/Add-exception-reporting-event.patch b/Spigot-Server-Patches/Add-exception-reporting-event.patch index b4f74e6485..90fc22485d 100644 --- a/Spigot-Server-Patches/Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/Add-exception-reporting-event.patch @@ -244,7 +244,7 @@ index 933934fb6..19fbf9b4a 100644 } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index a05fad54f..29219ec7b 100644 +index e42a0c776..c79fb7d57 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -0,0 +0,0 @@ import java.util.Random; diff --git a/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch index 5cf0f385c2..4caafb7c00 100644 --- a/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch @@ -31,7 +31,7 @@ index 4f2fa59ac..8af52a61f 100644 this.b.l(this.a); this.a = false; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 7430fe4ce..59654bcc9 100644 +index 48ff4c811..c23bd2e9b 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/Spigot-Server-Patches/Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch index 7f7e4dff32..c13ec8b7b9 100644 --- a/Spigot-Server-Patches/Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch +++ b/Spigot-Server-Patches/Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch @@ -1,12 +1,12 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Riley Park Date: Sun, 9 Apr 2017 23:50:15 -0700 -Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack Thanks - @gabizou +Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack +Thanks @gabizou diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 45ebd3f6..cf204f41 100644 +index 45ebd3f61..cf204f41f 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -0,0 +0,0 @@ public final class ItemStack { diff --git a/Spigot-Server-Patches/Player-affects-spawning-API.patch b/Spigot-Server-Patches/Player-affects-spawning-API.patch index daad05aa31..df917eafbf 100644 --- a/Spigot-Server-Patches/Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/Player-affects-spawning-API.patch @@ -17,7 +17,7 @@ index ec8f581ad..43e28d61c 100644 // CraftBukkit start public boolean fauxSleeping; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 21f5df3c0..a7283d36d 100644 +index a9e3b632b..1d26555d3 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving { @@ -44,7 +44,7 @@ index 5af51cc0a..7531c9ba9 100644 return false; } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 17bf3e410..a05fad54f 100644 +index b23c0be2a..e42a0c776 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -0,0 +0,0 @@ public final class SpawnerCreature { diff --git a/work/CraftBukkit b/work/CraftBukkit index 41a7d14f8c..d219213e2b 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 41a7d14f8cdfe1c72c6e2b3af7217bbeb70a1913 +Subproject commit d219213e2bb8b63e6ca51c1c86a7a698ac5106d3 diff --git a/work/Spigot b/work/Spigot index 625bc00700..d276ab1cca 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 625bc007002982e7c07a9d184fcdb1b6e13162b2 +Subproject commit d276ab1ccac39a41d48a524ed7da27561a03aed9