Updated Upstream (Bukkit/CraftBukkit) (#6568)
Upstream has released updates that appear 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: 7da4c0be SPIGOT-6729: Add Chunk.isEntitiesLoaded() CraftBukkit Changes: 9217b523 #929: Call EntityBlockFormEvent for Wither Rose placed by dead entity 757d42ae SPIGOT-6729: Add Chunk.isEntitiesLoaded()
This commit is contained in:
parent
910a1ff9f7
commit
5960af9d87
31 changed files with 80 additions and 80 deletions
|
@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
|
|||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index d9503597b2c2707bf28b31db9c1099fd326d2451..2c68fb49040dcb1b6acead188fa9094180577aa7 100644
|
||||
index 290cf1289cdbe344d4009f8012309fc1f7875100..ba5003e8ea8c5fd239bf5e430446ad5b813e9829 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -1,5 +1,6 @@
|
||||
|
@ -15,7 +15,7 @@ index d9503597b2c2707bf28b31db9c1099fd326d2451..2c68fb49040dcb1b6acead188fa90941
|
|||
import com.google.common.base.Objects;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
@@ -2940,6 +2941,13 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -2941,6 +2942,13 @@ public abstract class LivingEntity extends Entity {
|
||||
ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
|
||||
|
||||
if (!ItemStack.matches(itemstack1, itemstack)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue