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,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
|
|||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index 04a979eb45b903eb0411b996ef4fc9d889983b5d..8e07212a0e943ed698e5c7dc32ce17ffe90cd38e 100644
|
||||
index aecb662a8e9e803b619a88d1d1637386fb39c679..bb0b7da2e6bfd35bf3f937af928d515ef59401fb 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -3554,15 +3554,18 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -3555,15 +3555,18 @@ public abstract class LivingEntity extends Entity {
|
||||
this.entityData.set(LivingEntity.DATA_LIVING_ENTITY_FLAGS, (byte) j);
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@ index 04a979eb45b903eb0411b996ef4fc9d889983b5d..8e07212a0e943ed698e5c7dc32ce17ff
|
|||
}
|
||||
|
||||
}
|
||||
@@ -3635,6 +3638,7 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -3636,6 +3639,7 @@ public abstract class LivingEntity extends Entity {
|
||||
this.releaseUsingItem();
|
||||
} else {
|
||||
if (!this.useItem.isEmpty() && this.isUsingItem()) {
|
||||
|
@ -39,7 +39,7 @@ index 04a979eb45b903eb0411b996ef4fc9d889983b5d..8e07212a0e943ed698e5c7dc32ce17ff
|
|||
this.triggerItemUseEffects(this.useItem, 16);
|
||||
// CraftBukkit start - fire PlayerItemConsumeEvent
|
||||
ItemStack itemstack;
|
||||
@@ -3669,8 +3673,8 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -3670,8 +3674,8 @@ public abstract class LivingEntity extends Entity {
|
||||
}
|
||||
|
||||
this.stopUsingItem();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue