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

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@18f0f8d Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@5928327 Remove unneeded patch (#7806)
PaperMC/Paper@9fd870d Fix cancelling PlayerItemFrameChangeEvent (#7761)
PaperMC/Paper@8d1de8d deprecate old MaterialData api (#7585)
PaperMC/Paper@0116751 List world on tile entity placement exception (#7709)
PaperMC/Paper@73bd35d Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@7045f18 Change link to screamingsandals
This commit is contained in:
Encode42
2022-05-18 12:06:06 -04:00
parent 259a9eec4a
commit 9e37478326
26 changed files with 131 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0079-Entity-lifespan.patch
View File

@@ -5,7 +5,7 @@ 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 4a997a60baa9051f037b67ad60c09fb532b76114..06c02aa50d3ece744678ba99c21237b02c0a8aca 100644
index 55411e920b937ebc9f1c8d4d541a381fb8389689..29e85a8a8f0b21ad4d67a47053945286d24241ed 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2530,6 +2530,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -17,7 +17,7 @@ index 4a997a60baa9051f037b67ad60c09fb532b76114..06c02aa50d3ece744678ba99c21237b0
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 ce9087c1374d54ce59ec6897dd9885540bd5181c..fdadbd3b393916b0f6d110140d0c22c8e173dd1a 100644
index e1a13fadcf83e84c89a1bfc6d4e4f13f2299ffa5..8f53dd70d815493148709fbdff29a85924d12d00 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -129,6 +129,7 @@ public abstract class Mob extends LivingEntity {
@@ -28,7 +28,7 @@ index ce9087c1374d54ce59ec6897dd9885540bd5181c..fdadbd3b393916b0f6d110140d0c22c8
public boolean aware = true; // CraftBukkit
protected Mob(EntityType<? extends Mob> type, Level world) {
@@ -286,6 +287,7 @@ public abstract class Mob extends LivingEntity {
@@ -285,6 +286,7 @@ public abstract class Mob extends LivingEntity {
entityliving = null;
}
}
@@ -36,7 +36,7 @@ index ce9087c1374d54ce59ec6897dd9885540bd5181c..fdadbd3b393916b0f6d110140d0c22c8
this.target = entityliving;
return true;
// CraftBukkit end
@@ -330,9 +332,29 @@ public abstract class Mob extends LivingEntity {
@@ -329,9 +331,29 @@ public abstract class Mob extends LivingEntity {
this.playAmbientSound();
}
@@ -66,7 +66,7 @@ index ce9087c1374d54ce59ec6897dd9885540bd5181c..fdadbd3b393916b0f6d110140d0c22c8
@Override
protected void playHurtSound(DamageSource source) {
this.resetAmbientSoundTime();
@@ -516,6 +538,7 @@ public abstract class Mob extends LivingEntity {
@@ -515,6 +537,7 @@ public abstract class Mob extends LivingEntity {
}
nbt.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
@@ -74,7 +74,7 @@ index ce9087c1374d54ce59ec6897dd9885540bd5181c..fdadbd3b393916b0f6d110140d0c22c8
}
@Override
@@ -586,6 +609,11 @@ public abstract class Mob extends LivingEntity {
@@ -585,6 +608,11 @@ public abstract class Mob extends LivingEntity {
this.aware = nbt.getBoolean("Bukkit.Aware");
}
// CraftBukkit end
@@ -86,7 +86,7 @@ index ce9087c1374d54ce59ec6897dd9885540bd5181c..fdadbd3b393916b0f6d110140d0c22c8
}
@Override
@@ -1615,6 +1643,7 @@ public abstract class Mob extends LivingEntity {
@@ -1614,6 +1642,7 @@ public abstract class Mob extends LivingEntity {
this.setLastHurtMob(target);
}