mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
properly remove tuinity
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||||
index d16149731efbaa9ad19083d5654f4e1e14ef3b76..10c5af3949af4a3bee4999753e7545f0ac745e63 100644
|
||||
index 611989cd519a5c695d1369b0e74159925c55b726..f92e412d7f49c620699274ecf9ed085c5af53ab8 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||||
@@ -2472,6 +2472,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
@@ -2390,6 +2390,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
|
||||
Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
|
||||
PlayerInteractEntityEvent event;
|
||||
@@ -17,7 +17,7 @@ index d16149731efbaa9ad19083d5654f4e1e14ef3b76..10c5af3949af4a3bee4999753e7545f0
|
||||
event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
|
||||
} else {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||||
index b70120c32027a456037daac363d420d2edd4bdfe..fdc1b99f0a032a76a02ee88b28d62e049a2fc54c 100644
|
||||
index 5a9a658c56f1d39bcbcabc0415c1c3f7d96cfab7..6ea0fc81efe976c2b33cc12de175b357323b9cfd 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||||
@@ -124,7 +124,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
@@ -94,7 +94,7 @@ index b70120c32027a456037daac363d420d2edd4bdfe..fdc1b99f0a032a76a02ee88b28d62e04
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1626,7 +1658,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
@@ -1620,7 +1652,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
this.a((EntityLiving) this, entity);
|
||||
this.z(entity);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user