Drop patch
This commit is contained in:
@@ -156,19 +156,6 @@ index bee42880274cf36c57abc5f633e6f14f41a0ea2b..12fa631aa176e67dcda522dca6376a69
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index f1459e5929f178cdab864506d1a485df61fde035..6e7a3acb40ef3ed062c3e6cc2c5bf5cd35f2d2d6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -3167,7 +3167,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
}
|
||||
|
||||
public boolean equipmentHasChanged(ItemStack stack, ItemStack stack2) {
|
||||
- return !ItemStack.isSame(stack2, stack);
|
||||
+ return !ItemStack.isSameItem(stack2, stack);
|
||||
}
|
||||
|
||||
private void handleHandSwap(Map<EquipmentSlot, ItemStack> equipmentChanges) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
index 2a6a85519c63bd3f879a8dbe146a9d05310cee3c..d6cdb7c3314004ee25cbed96eb289d420999c01c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
@@ -59,7 +59,7 @@ index 506e4d80e47723a0764703578370a45ad2f126fd..a1d03e7d4f0a73930e932fffc8707238
|
||||
|
||||
if (!this.entity.getPassengers().isEmpty()) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index 6e7a3acb40ef3ed062c3e6cc2c5bf5cd35f2d2d6..5e5450aeb355ad396ac369816050f297ca0f309f 100644
|
||||
index f0d565ac0b3c8d3c3a200348a16e7db21ff3920a..67a83bfd09befa7250f7a02eaf21797cc24e8c71 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -262,6 +262,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
Reference in New Issue
Block a user