Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 18:28:15 +02: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:
45ec379 Bump paperweight to 1.1.8
59371cb Optimize Anti-Xray (#5991)
1d194e5 [ci-skip] Fix description of add-plugin command line option (#6031)
333cc2e Don't complete skull lookups on main thread (MC-227435)
2291667 [ci skip] patch-ception
2103ad2 Fix NPE when using broadcast as players are joining
This commit is contained in:
William Blake Galbreath
2021-06-29 17:27:48 -05:00
parent cd5f184f6d
commit bb8a98a41f
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@ index af0c7bbce7641f5aa659abb440a6cd6f57019ede..71030d9e156ce28f1ef9e3ed6845f022
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 d65ca67bb0d46ecd8a4003e44cfec71661679480..51ef325fab982c2fd8a7eb3d7e73cbfdf5b82734 100644
index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..5967cb5b357bd64b2ed7b48a27ad0bea56ed0349 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -991,6 +991,8 @@ public abstract class PlayerList {
@@ -110,10 +110,10 @@ index 1b3ab9fd6a6d094d559e18a1d119e651c411a11e..2d42f36e9f1ce6bf064588d84ed7ae52
public boolean babiesAreRidable = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e2d28ea4d8bb0df1a394afe7a48683b443989552..22693f6c27b120c987153753dd33ffd37c227592 100644
index 6b4f4c10254e2e9e39e237086a3c8cf929c02156..a2b041d713e937b4b5e1e6c7c73be8ab32115120 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2544,5 +2544,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2545,5 +2545,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}