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) (#967)

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

Paper Changes:
PaperMC/Paper@608482d cleanup filtered sign text (#7777)
PaperMC/Paper@4166632 Updated Upstream (Bukkit/CraftBukkit) (#7776)
PaperMC/Paper@e564110 Couple fixes/improvements to PlayerSetSpawnEvent (#6754)
PaperMC/Paper@e5da93a Deprecate duplicate SoundGroup API (#7509)
This commit is contained in:
Oharass
2022-05-01 16:47:48 -05:00
committed by GitHub
parent a9042b304f
commit cda46a038f
12 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0018-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 38c2e2b4e6577dd6db84b86147a6f0c5bd0b8879..c03f9ed7dfb53041d37de950b2ec734bde614d0e 100644
index 11ad98d35e33ba2465876c222288d047ab5189f1..3c42c1d0c9542f8ce058cd2bfc931f53ad0a82e8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -254,6 +254,7 @@ public class ServerPlayer extends Player {
@@ -62,7 +62,7 @@ index 38c2e2b4e6577dd6db84b86147a6f0c5bd0b8879..c03f9ed7dfb53041d37de950b2ec734b
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2473,9 +2483,17 @@ public class ServerPlayer extends Player {
@@ -2474,9 +2484,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -108,7 +108,7 @@ index 1d61e34b1cc032089dbd715814553e59ebc8ce5c..763874b78363d75f8c386cff3cf48c93
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index e4e0db7d94ab7c86f3bdd8be17f85d6ea403b313..b9438bfd5f0949995d64e7c2ca0acd43f13fec76 100644
index 631472b43ac25337a05184d096e7bc97f47ce9e6..2606c339f5c24e9f73c6270669fb3d2ac4d41c1c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1004,6 +1004,8 @@ public abstract class PlayerList {
@@ -121,7 +121,7 @@ index e4e0db7d94ab7c86f3bdd8be17f85d6ea403b313..b9438bfd5f0949995d64e7c2ca0acd43
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 e9c3768ef277fc88db4d5660e241ec7ef8e770c4..4f007dce3f4f7cf19d8e38b46435c762813c6c43 100644
index e7d454da116261f24341391e6933aaedd26a4a18..29e12552745000fbfa1cee6668a5bf039f918f6f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2817,5 +2817,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {