Updated Upstream (Paper)

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

View File

@@ -177,7 +177,7 @@ index 6a4e44dd8935018d1b5283761dfb8e855be62987..afe70b0d5bd98d05bbb7afc756108f09
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6388f8ebd0b2aede894da39cdab2c2965e0f231f..b2b3d591d86f51e5cb118e2334f840c627b5e677 100644
index be910f7950edcbfcd5c6192ff294166c470149e9..64a9288888cd5c008d48d919eb2927670eb35696 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -129,8 +129,16 @@ public class PurpurConfig {
@@ -220,10 +220,10 @@ index 36cbaefea53a60c4a7176bf699c03e7cac338976..1b3ab9fd6a6d094d559e18a1d119e651
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fc8a8ccd4273ec5d44b216d96034ac048a2ac38e..e2d28ea4d8bb0df1a394afe7a48683b443989552 100644
index 1da5b6f73e78a697031f7662e68c546543fb9d1a..6b4f4c10254e2e9e39e237086a3c8cf929c02156 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2528,4 +2528,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2529,4 +2529,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end