Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +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@41ab602 [ci skip] couple more fixes for build pr jar label (#8599)
PaperMC/Paper@c40f8d5 Sync offhand slot in menus (#7341)
PaperMC/Paper@425baed Fully deserialise persistent anger post async load (#8560)
PaperMC/Paper@ec6a9a3 Updated Upstream (Bukkit/CraftBukkit) (#8604)
PaperMC/Paper@96fdafd Player Entity Tracking Events (#4722)
PaperMC/Paper@407a445 Fix dumplisteners missing folder creation
PaperMC/Paper@b07d5e0 Limit pet look distance (#8612)
PaperMC/Paper@476ef25 Add missing Fluid type (#8608)
This commit is contained in:
Encode42
2022-12-07 12:05:48 -05:00
parent 86f2da583b
commit 482a83ff9f
21 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0019-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f5731310db0c52c 100644
index 1dea5322a07e63f564d506c3255ebb4ee0066b37..f3a90f798f6068e86e1dfd1de49b0fdc074cc7c9 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -16,7 +16,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
public boolean isRealPlayer; // Paper
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
@@ -358,6 +359,7 @@ public class ServerPlayer extends Player {
@@ -365,6 +366,7 @@ public class ServerPlayer extends Player {
this.bukkitPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -24,7 +24,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
}
// Yes, this doesn't match Vanilla, but it's the best we can do for now.
@@ -1022,6 +1024,12 @@ public class ServerPlayer extends Player {
@@ -1029,6 +1031,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1029,7 +1037,7 @@ public class ServerPlayer extends Player {
@@ -1036,7 +1044,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -46,7 +46,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1203,6 +1211,7 @@ public class ServerPlayer extends Player {
@@ -1210,6 +1218,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
return this;
}
}
@@ -2008,6 +2017,7 @@ public class ServerPlayer extends Player {
@@ -2015,6 +2024,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2538,9 +2548,17 @@ public class ServerPlayer extends Player {
@@ -2545,9 +2555,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {