Update Upstream

Spigot-Server-Patches/Enderman.teleportRandomly.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 2b484c819..e441fa234 100644
+index 2b484c8199..e441fa234d 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -0,0 +0,0 @@ public class EntityEnderman extends EntityMonster {
@@ -18,7 +18,7 @@ index 2b484c819..e441fa234 100644
          double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D;
          double d1 = this.locY + (double) (this.random.nextInt(64) - 32);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index da8a70d6a..e56da9085 100644
+index 970efabd37..0c5f359346 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 @@ -0,0 +0,0 @@ public class CraftEnderman extends CraftMonster implements Enderman {
@@ -26,7 +26,7 @@ index da8a70d6a..e56da9085 100644
      }
  
 +    @Override public boolean teleportRandomly() { return getHandle().teleportRandomly(); } // Paper
+     @Override
      public MaterialData getCarriedMaterial() {
          IBlockData blockData = getHandle().getCarried();
-         return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData);
 --