Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d332623 Avoid potential place where the world map could be modified after its iterator is created (#8315)
PaperMC/Paper@6736f39 Fix mangled patch
PaperMC/Paper@4d52f1d Add method isTickingWorlds to Bukkit (#8316)
PaperMC/Paper@62680d5 Avoid item meta usage for itemstack enchantment getter (#8373)
PaperMC/Paper@b4c025b Fix player desync on dimension change (#8253)
This commit is contained in:
BillyGalbreath
2022-09-24 08:04:00 -05:00
parent 103965b5b4
commit ec75e5964a
28 changed files with 99 additions and 99 deletions

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 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d470002c2a2 100644
index 4c1c5b43b5080ff860ee511d00dc9fdd6cab8b7b..d504c6efe13681f4d62862074d49d7c2b99f5fe5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -46,7 +46,7 @@ index 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d47
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1198,6 +1206,7 @@ public class ServerPlayer extends Player {
@@ -1199,6 +1207,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d47
return this;
}
}
@@ -1987,6 +1996,7 @@ public class ServerPlayer extends Player {
@@ -1988,6 +1997,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d47
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2512,9 +2522,17 @@ public class ServerPlayer extends Player {
@@ -2513,9 +2523,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {