Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@2eca2a2 Add Player#sendEquipmentChange(Map) API (#8800)
PaperMC/Paper@b082d89 Win Screen API (#8802)
PaperMC/Paper@b1b19b6 [ci skip] Fix PiglinBarterEvent JavaDoc (#8795)
This commit is contained in:
granny
2023-01-23 00:15:17 -08:00
parent 1dcc7bf149
commit cac8a9b5a8
45 changed files with 43 additions and 92 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 668572e6819acdca4b658f693bf9069961dd3366..367a3d1181f29375aed48a861dcf4c21
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 168abc1f0c795bf840ca87b301dfa85ac0b5dd16..a9ed0ddc7c5bedb4bca774caa583a6889259e4c0 100644
index c8dedd2bfcc633ac1be891c8016dc9384e199796..0e09db289dadb812faf6850d6cbaf202fcc2facf 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -953,6 +953,8 @@ public abstract class PlayerList {
@@ -121,10 +121,10 @@ index 168abc1f0c795bf840ca87b301dfa85ac0b5dd16..a9ed0ddc7c5bedb4bca774caa583a688
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 56cf4ce045dcd9d52beee849165cad3673601b54..d2bb97c72c75a5d56e1d34294717aec959779196 100644
index 498fc20c89142448d72433774e2201cca183c936..e173e0c98862353cd333ebeaa0293bf86529b6e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3042,5 +3042,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3055,5 +3055,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}
@@ -146,7 +146,7 @@ index 56cf4ce045dcd9d52beee849165cad3673601b54..d2bb97c72c75a5d56e1d34294717aec9
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 765523911e448bd7f73e3f6cb8d0e78ddecb9f66..fcf58a69e8f3d0e3aa2566ddcdf05554aec979de 100644
index 4c69037cd0f7c713da7b357b2f09f0e78adc2b10..875a0381b27077a5024a267eb545d61fd8e3dcf4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -98,6 +98,8 @@ public class PurpurWorldConfig {