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)

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

Paper Changes:
PaperMC/Paper@0ddd20c Updated Upstream (CraftBukkit/Spigot)
PaperMC/Paper@9592da1 Add method to get highest anger level of warden
This commit is contained in:
BillyGalbreath
2022-08-14 04:43:41 -05:00
parent 0fd6a5698f
commit ac5c303a0d
23 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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 c72b20e3e7eda999c6da07e7e6fb46826c4369a9..481e474f48d9409f4d8a337b334a17627c9b8ccb 100644
index 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d470002c2a2 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 {
@@ -82,10 +82,10 @@ index c72b20e3e7eda999c6da07e7e6fb46826c4369a9..481e474f48d9409f4d8a337b334a1762
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 094698b4bf0546704d5ade47a17988474344d244..9eef5e10a4528e56080f4bc1438b483304720a4f 100644
index b10a5f39145cf62b981fad6595e42ac09602d510..9873e559675203df5fc0b44c820fdd2671b17c23 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2102,12 +2102,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2105,12 +2105,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
@@ -108,7 +108,7 @@ index 094698b4bf0546704d5ade47a17988474344d244..9eef5e10a4528e56080f4bc1438b4833
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 989562f870c359cf4655af2b2013b2b1b5f1f229..fc27bdf91b946ac4c2a6e4adec3693fd0ea5324a 100644
index 0751456e9431359afa41d224c5438ac6e71644a1..27db72513532ef69c49d4c805f1bf76718a37908 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1008,6 +1008,8 @@ public abstract class PlayerList {
@@ -121,7 +121,7 @@ index 989562f870c359cf4655af2b2013b2b1b5f1f229..fc27bdf91b946ac4c2a6e4adec3693fd
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 fd5906dd18a4ff377c6e2dd180008124faa9600d..0655abd90e7fc34518153b320f5674bd4ebe8f5d 100644
index c57264e4f4284550d674a9c4083cc9cfbeb355bb..28ee76ac0df38787274a0c2e84738ece7537f5be 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2923,5 +2923,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {