Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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@dab4864 {ci skip} add workflow for auto-managing issue board (#8958)
PaperMC/Paper@3c8c223 Fix some broken block place logic (#9094)
PaperMC/Paper@f5677aa Fix TPS command output (#9091)
PaperMC/Paper@e9f6e7a Properly resync player on Player#setPlayerProfile (#9080)
PaperMC/Paper@ad6c14c Fix unknown cmd msg for mc namespaced cmds (#9059)
This commit is contained in:
granny
2023-04-06 19:11:46 -07:00
parent adc78043f5
commit 1407eef7e0
13 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0018-Player-invulnerabilities.patch
View File

@@ -108,7 +108,7 @@ index 951dfa2b71695d2cf3dd3c14a9f7c9165e5c5a4d..470f44cd4627ab48573a22714ccd088b
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 3af2e1eabfa3e49f2aad676fe1516f749f289285..f50689f9a9e74856725f92817892c1af0edf340d 100644
index 6bd992fd206673cc1c9150f25f27715d261f31d0..4e808684dc7fef577718f63d5ca303e838ea6195 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -966,6 +966,8 @@ public abstract class PlayerList {
@@ -121,10 +121,10 @@ index 3af2e1eabfa3e49f2aad676fe1516f749f289285..f50689f9a9e74856725f92817892c1af
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 10d52b858be9ab93bd934bf9ca35f272410c3c96..6ad913ee78570db794fd2953cc1320905fa557de 100644
index 354ee1f6e56413e270ec1a94c156b849e9e8e2a7..78c9113885052ce04cbc6481d777e9177dab09d6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3187,5 +3187,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3193,5 +3193,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}
@@ -146,7 +146,7 @@ index 10d52b858be9ab93bd934bf9ca35f272410c3c96..6ad913ee78570db794fd2953cc132090
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 21a33a7952ea9d70df45a99e82286713fd939696..786c1e30c56dfe28d00a9727c97d837cf7310ad3 100644
index cbb750eabb892348b3b6632782e9eef9b125d16d..5bda6411f4c419cf6c0f8b6e498ec22f3f34da3a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,8 @@ public class PurpurWorldConfig {