From 362e4252719cbe849c72e7d81488a7584a8d9888 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 10 Apr 2017 22:11:26 -0500 Subject: [PATCH] Update upstream CB/S --- .../0011-Allow-nerfed-mobs-to-jump.patch | 8 ++++---- ...figurable-despawn-distances-for-living-entiti.patch | 8 ++++---- .../0017-Player-affects-spawning-API.patch | 8 ++++---- .../0063-Add-exception-reporting-event.patch | 8 ++++---- ...x-NFE-when-attempting-to-read-EMPTY-ItemStack.patch | 10 +++++----- work/CraftBukkit | 2 +- work/Spigot | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch index 4555fb4d9d..2e6b356842 100644 --- a/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch @@ -1,4 +1,4 @@ -From baef57831bfe28a7f0187a69bdb48b1f03ec8bde Mon Sep 17 00:00:00 2001 +From 6601ad2f54c73981b4fe6198097e131cb22f75e4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:24:16 -0600 Subject: [PATCH] Allow nerfed mobs to jump @@ -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 @@ -44,6 +44,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -42,7 +42,7 @@ index 7430fe4ce..59654bcc9 100644 public EntityInsentient(World world) { super(world); -@@ -643,6 +644,12 @@ public abstract class EntityInsentient extends EntityLiving { +@@ -645,6 +646,12 @@ public abstract class EntityInsentient extends EntityLiving { // Spigot Start if ( this.fromMobSpawner ) { @@ -78,5 +78,5 @@ index e3b405856..2d27aa63a 100644 if (this.a.getRandom().nextFloat() < 0.8F) { this.a.getControllerJump().a(); -- -2.12.0.windows.1 +2.12.1.windows.1 diff --git a/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch index 641b556a0a..7888ecdb36 100644 --- a/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,4 +1,4 @@ -From 8b4c81d464e94b495826f3cbc47d81d8da3f2c3b Mon Sep 17 00:00:00 2001 +From 71ef92829982f9b99e1b96d8e903a5064341ff03 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 1 Mar 2016 13:51:54 -0600 Subject: [PATCH] Add configurable despawn distances for living entities @@ -30,10 +30,10 @@ 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 -@@ -622,13 +622,13 @@ public abstract class EntityInsentient extends EntityLiving { +@@ -624,13 +624,13 @@ public abstract class EntityInsentient extends EntityLiving { double d2 = entityhuman.locZ - this.locZ; double d3 = d0 * d0 + d1 * d1 + d2 * d2; @@ -51,5 +51,5 @@ index 59654bcc9..21f5df3c0 100644 } } -- -2.12.0.windows.1 +2.12.1.windows.1 diff --git a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch index 87ea50f41c..c39bfb4dcd 100644 --- a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 04d76606600ef86808b56ab272b3bc6349211a9e Mon Sep 17 00:00:00 2001 +From 3cba9d06727dbd8332e08f22fa33572434be2c51 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API @@ -17,10 +17,10 @@ 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 -@@ -616,7 +616,7 @@ public abstract class EntityInsentient extends EntityLiving { +@@ -618,7 +618,7 @@ public abstract class EntityInsentient extends EntityLiving { } else { EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D); @@ -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 @@ -52,7 +52,7 @@ public final class SpawnerCreature { diff --git a/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch index 942ec1be8b..b85be005bc 100644 --- a/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 1af338583cb34ab7e0569206f6b7e2eeec97135e Mon Sep 17 00:00:00 2001 +From e809913b483eee57889389a0edc97d2d111d4232 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -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 @@ -7,6 +7,7 @@ import java.util.Random; @@ -263,7 +263,7 @@ index a05fad54f..29219ec7b 100644 return j1; } -@@ -284,6 +286,7 @@ public final class SpawnerCreature { +@@ -288,6 +290,7 @@ public final class SpawnerCreature { entityinsentient = (EntityInsentient) biomebase_biomemeta.b.getConstructor(new Class[] { World.class}).newInstance(new Object[] { world}); } catch (Exception exception) { exception.printStackTrace(); @@ -372,5 +372,5 @@ index 9952b64be..e30cfb7b7 100644 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } -- -2.12.0.windows.1 +2.12.1.windows.1 diff --git a/Spigot-Server-Patches/0214-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0214-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch index deb0eb80a1..a61f07898c 100644 --- a/Spigot-Server-Patches/0214-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch +++ b/Spigot-Server-Patches/0214-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch @@ -1,12 +1,12 @@ -From 01b5aef1aff1812344a999fbabba891c5f29b73f Mon Sep 17 00:00:00 2001 +From 872753265052c7e59cad78a66eba26adf9ab231f Mon Sep 17 00:00:00 2001 From: kashike 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 @@ -97,7 +97,7 @@ public final class ItemStack { @@ -19,5 +19,5 @@ index 45ebd3f6..cf204f41 100644 // CraftBukkit start - Route through setData for filtering // this.damage = Math.max(0, nbttagcompound.getShort("Damage")); -- -2.12.2 +2.12.1.windows.1 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