Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 16:49:19 -04:00
parent 9fc89d2e46
commit 102b3130fe
13 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0077-Entity-lifespan.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 816be58e98b26443b371ec5333d3878f1e66751b..ca27c557ab3e71f894f31131fa54860a82294d0d 100644
index de5fd575e12a3a991cb907675f256324d0147aef..d4e821e30a1151e71d2e4d87a74f5468929356da 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2713,6 +2713,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2714,6 +2714,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
}
if (entity.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {
@@ -17,7 +17,7 @@ index 816be58e98b26443b371ec5333d3878f1e66751b..ca27c557ab3e71f894f31131fa54860a
private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand).copy();
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 00911f1bc7ecbad931a9db83da071f4c684aba45..345c4c7087da5745995a76e3786d1f8173580b3b 100644
index 741bd85f10afb7b6f79213d5270af8e27741ad62..5385c1b97cd2a85b43e75ef1dfae770879f29954 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -134,6 +134,7 @@ public abstract class Mob extends LivingEntity {