Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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:
5b20df6bf added PlayerNameEntityEvent
ff9c82444 Add worldborder events
616b1f3cd consider enchants for destroy speed
aaef1d5cc fix file conversion
674d8f7f7 Make discovered maps config work in treasure maps from loot tables too
be1687914 stop firing pressure plate EntityInteractEvent for ignored entities (fixes #4962)
7d56f38ed Do not use the bukkit singleton for the GUI (Fixes #5301)
4c9bdf53a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5299)
8647bd130 Improve ServerGUI
fcc6d3359 Throw proper exception on empty JsonList file
17d2e1291 Fix interact event in adventure mode
964e0bf42 MC-29274: Fix Wither hostility towards players
9e24a5213 Fixed furnace cook-speed multiplier losing precision when calculating cook time
c7e42faa3 Do not create unnecessary copies of the passenger list
40881ad67 added tnt minecarts to the tnt height nerf
26be708f4 Remove streams from SensorNearest
5b5989b21 fix nullability of playerlist header/footer, closes #5290
45bc531dd Fix Material#getTranslationKey for Block Materials (#5294)
This commit is contained in:
BillyGalbreath
2021-03-04 21:45:44 -06:00
parent 68ff99ea92
commit d93887a156
60 changed files with 169 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0016-Player-invulnerabilities.patch
View File

@@ -67,7 +67,7 @@ index a4e266955ada46db08b1815e549fa4bde9606df2..599d7fbc4db928a9825e154c09c9a74d
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index e1e6f88f94c86fb4254676bc6a26b8a03a4d668e..0cde6d65d67ec599e83d3a6dc5a6708eb67fc9ac 100644
index ee9fa89c15d52ae00f33c7e3d3102ca107055160..958b7eadbab06226259c9ae9db7615cc71fa7c56 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1737,6 +1737,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -79,10 +79,10 @@ index e1e6f88f94c86fb4254676bc6a26b8a03a4d668e..0cde6d65d67ec599e83d3a6dc5a6708e
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 2aafb0295e37eae3510fd5c5105ad53fa6f2690c..4544c9ba658aa866d6443dcfb970ddcbdcae289c 100644
index 193a39ba0c07b0f438aba6b3a00af51fa93bd53d..56a20edf21427eee9ae292de42a790e9d1c4bf9d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -918,6 +918,8 @@ public abstract class PlayerList {
@@ -919,6 +919,8 @@ public abstract class PlayerList {
}
// Paper end
@@ -108,10 +108,10 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3c177abe4ff7e885822dca23684df741021c3941..bb954462b5443ca93d833d460cbd1d0cb6292309 100644
index 2460791eaed07ca4a42e945bf6f5ae907b4105cb..2b25e58ce0d5b6d54c65e70cffd46e1085b02275 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2472,5 +2472,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2442,5 +2442,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetIdleTimer();
}