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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ef0e5a6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2022-09-13 17:32:56 -05:00
parent 664774af5a
commit 6e7bb8323f
40 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0078-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 ce598d875fb2593349dadd9d41d745a8b288d561..0cf63861f3702524facd5e7ffe7da9e8b237d904 100644
index 645e314a52c91c38378c0972ac28ba7672eb7f14..d49393357ffd7d2c776b45634264f1e40d153fba 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2964,6 +2964,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2968,6 +2968,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
if (entity.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {
@@ -17,7 +17,7 @@ index ce598d875fb2593349dadd9d41d745a8b288d561..0cf63861f3702524facd5e7ffe7da9e8
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 1e4629de69b762f89efe54a93f28292d3657bccb..fe97b5b327af1189b166243c42be99892226cd9e 100644
index c6e2ecb9c7417c00118d7b5a58583a3f4f5e1485..8d7adb461acdc37ee820c56c15944eedeefec390 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 {
@@ -66,7 +66,7 @@ index 1e4629de69b762f89efe54a93f28292d3657bccb..fe97b5b327af1189b166243c42be9989
@Override
protected void playHurtSound(DamageSource source) {
this.resetAmbientSoundTime();
@@ -522,6 +544,7 @@ public abstract class Mob extends LivingEntity {
@@ -528,6 +550,7 @@ public abstract class Mob extends LivingEntity {
}
nbt.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
@@ -74,7 +74,7 @@ index 1e4629de69b762f89efe54a93f28292d3657bccb..fe97b5b327af1189b166243c42be9989
}
@Override
@@ -592,6 +615,11 @@ public abstract class Mob extends LivingEntity {
@@ -598,6 +621,11 @@ public abstract class Mob extends LivingEntity {
this.aware = nbt.getBoolean("Bukkit.Aware");
}
// CraftBukkit end
@@ -86,7 +86,7 @@ index 1e4629de69b762f89efe54a93f28292d3657bccb..fe97b5b327af1189b166243c42be9989
}
@Override
@@ -1634,6 +1662,7 @@ public abstract class Mob extends LivingEntity {
@@ -1640,6 +1668,7 @@ public abstract class Mob extends LivingEntity {
this.setLastHurtMob(target);
}