[Auto] Update Upstream

Upstream has released updates that appear to apply compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing.

Bukkit Changes:
d2834556 SPIGOT-4219: Event for PigZombies angering.

CraftBukkit Changes:
a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations
195f071e SPIGOT-4219: Event for PigZombies angering.
5e3082c7 SPIGOT-4230: Improve legacy block types
This commit is contained in:
Automated
2018-08-05 19:46:43 -04:00
parent cfa9570036
commit 6249addbaa
148 changed files with 275 additions and 299 deletions

View File

@@ -7,7 +7,7 @@ This will help guarantee that entities are always in the
chunk that they are currently located at.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6b0ca4eb..68b4a902 100644
index 6b0ca4eb98..68b4a902eb 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
@@ -27,7 +27,7 @@ index 6b0ca4eb..68b4a902 100644
protected SoundEffect ad() {
diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java
index f2d3d0b4..f2006061 100644
index f2d3d0b4c7..f20060614d 100644
--- a/src/main/java/net/minecraft/server/EntityLeash.java
+++ b/src/main/java/net/minecraft/server/EntityLeash.java
@@ -0,0 +0,0 @@ public class EntityLeash extends EntityHanging {
@@ -39,7 +39,7 @@ index f2d3d0b4..f2006061 100644
public void setDirection(EnumDirection enumdirection) {}
diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
index 95c6cd89..bc11e7da 100644
index 95c6cd8971..bc11e7da2b 100644
--- a/src/main/java/net/minecraft/server/EntityShulker.java
+++ b/src/main/java/net/minecraft/server/EntityShulker.java
@@ -0,0 +0,0 @@ public class EntityShulker extends EntityGolem implements IMonster {