Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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@b097a24 Expose isUnderWater to Entity (#8454)
PaperMC/Paper@6b26cfc Add missing Entity + Projectile API (#7632)
PaperMC/Paper@de2d2d4 Add PlayerInventorySlotChangeEvent (#7321)
PaperMC/Paper@f7c8d79 Fix stacktrace in server tests
PaperMC/Paper@b9cf1ac Fix a classloading issue in tests (#8459)
PaperMC/Paper@7fe34e9 Make CraftMinecartTNT public
PaperMC/Paper@514a606 Elder Guardian appearance API (#8455)
PaperMC/Paper@2094011 Update settings directory path in exceptions (#7968)
PaperMC/Paper@0bdf997 Avoid cycle deprecation (#8466)
PaperMC/Paper@eb68bd4 Allow changing bed's 'occupied' property (#8458)
This commit is contained in:
BillyGalbreath
2022-10-15 12:51:22 -05:00
parent 3454e6a047
commit 50687db565
47 changed files with 196 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
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 492a7f7d2d0a06c10f11c7cd61edba26e40d9f42..2044a297f1820b41c41df9a8b3b0bbff9ae08432 100644
index aa509809e88f85e28698bb22aed77169cbedfcf4..671ef13c7abdd77ad49fc490c2117a224b701311 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 492a7f7d2d0a06c10f11c7cd61edba26e40d9f42..2044a297f1820b41c41df9a8b3b0bbff
public boolean isRealPlayer; // Paper
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
@@ -339,6 +340,7 @@ public class ServerPlayer extends Player {
@@ -358,6 +359,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 492a7f7d2d0a06c10f11c7cd61edba26e40d9f42..2044a297f1820b41c41df9a8b3b0bbff
}
// Yes, this doesn't match Vanilla, but it's the best we can do for now.
@@ -1003,6 +1005,12 @@ public class ServerPlayer extends Player {
@@ -1022,6 +1024,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index 492a7f7d2d0a06c10f11c7cd61edba26e40d9f42..2044a297f1820b41c41df9a8b3b0bbff
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1010,7 +1018,7 @@ public class ServerPlayer extends Player {
@@ -1029,7 +1037,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -46,7 +46,7 @@ index 492a7f7d2d0a06c10f11c7cd61edba26e40d9f42..2044a297f1820b41c41df9a8b3b0bbff
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1184,6 +1192,7 @@ public class ServerPlayer extends Player {
@@ -1203,6 +1211,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index 492a7f7d2d0a06c10f11c7cd61edba26e40d9f42..2044a297f1820b41c41df9a8b3b0bbff
return this;
}
}
@@ -1973,6 +1982,7 @@ public class ServerPlayer extends Player {
@@ -1992,6 +2001,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 492a7f7d2d0a06c10f11c7cd61edba26e40d9f42..2044a297f1820b41c41df9a8b3b0bbff
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2498,9 +2508,17 @@ public class ServerPlayer extends Player {
@@ -2517,9 +2527,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -121,10 +121,10 @@ index 2da8186b5f34b5cce97512f50323bee091d380ab..e09cfac18f2b952bb54ec75b04505024
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d39f57ed1903714c5d52817a9ce40d6329f79ded..279c71e085a0148abfc040c9b84f9b079a1416b6 100644
index 9a8c4da2151cf7bfeef545d754274bb92152e185..7e81d442b3e304734ad9bc54065bea770885d705 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2963,5 +2963,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2970,5 +2970,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}