core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Auto] Updated Upstream (Bukkit/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

Bukkit Changes:
dde07e23 Update docs for Enderman carrying methods

CraftBukkit Changes:
452a1738 SPIGOT-4271: Fix API error when enderman are not carrying a block
This commit is contained in:
Aikar 2018-08-14 18:59:40 -04:00
parent 466e43b16d
commit 1d2b2da49e
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0258-Enderman.teleportRandomly.patch
View File

@ -1,4 +1,4 @@
From 4e46fdb4d4dd7840a38112aae13fbb25c6170d9c Mon Sep 17 00:00:00 2001 From 247294cb19dc83b384646f7a329f44a277022c91 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 13:29:44 -0400 Date: Mon, 30 Apr 2018 13:29:44 -0400
Subject: [PATCH] Enderman.teleportRandomly() Subject: [PATCH] Enderman.teleportRandomly()
@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. 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 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index a766b38959..0f64c8f2b5 100644 index a766b3895..0f64c8f2b 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java --- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -184,6 +184,7 @@ public class EntityEnderman extends EntityMonster { @@ -184,6 +184,7 @@ public class EntityEnderman extends EntityMonster {
@ -18,17 +18,17 @@ index a766b38959..0f64c8f2b5 100644
double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D; double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D;
double d1 = this.locY + (double) (this.random.nextInt(64) - 32); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
index 5998530a8f..f62ea821fc 100644 index b81693d9f..9bc6a6c0c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
@@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman { @@ -17,6 +17,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
super(server, entity); super(server, entity);
} }
+ @Override public boolean teleportRandomly() { return getHandle().teleportRandomly(); } // Paper + @Override public boolean teleportRandomly() { return getHandle().teleportRandomly(); } // Paper
public MaterialData getCarriedMaterial() { public MaterialData getCarriedMaterial() {
IBlockData blockData = getHandle().getCarried(); IBlockData blockData = getHandle().getCarried();
return CraftMagicNumbers.getMaterial(blockData); return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData);
-- --
2.18.0 2.18.0

2
work/Bukkit

@ -1 +1 @@
Subproject commit 290eb7296a2c24e0385c913850197311208f63f0 Subproject commit dde07e23c89024c7a63299a447842600f2e06cf1

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 4a241086654d1331eaf51c749306a04ae224e7f1 Subproject commit 452a173807261fbf8c016223277bd26cb77c62d1