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:
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

2
build.gradle.kts
View File

@@ -1,7 +1,7 @@
plugins { plugins {
java java
id("com.github.johnrengelman.shadow") version "7.0.0" apply false id("com.github.johnrengelman.shadow") version "7.0.0" apply false
id("io.papermc.paperweight.patcher") version "1.1.7" id("io.papermc.paperweight.patcher") version "1.1.8"
} }
repositories { repositories {

2
gradle.properties
View File

@@ -4,7 +4,7 @@ version = 1.17-R0.1-SNAPSHOT
mcVersion = 1.17 mcVersion = 1.17
packageVersion = 1_17_R1 packageVersion = 1_17_R1
paperCommit = 47139376c468fad9261343a3806e241c23a9d4c3 paperCommit = 2103ad2f8188a3a86783f4ff886f14b1b9047462
org.gradle.parallel = true org.gradle.parallel = true
org.gradle.vfs.watch = false org.gradle.vfs.watch = false

6
patches/server/0010-AFK-API.patch
View File

@@ -177,7 +177,7 @@ index 6a4e44dd8935018d1b5283761dfb8e855be62987..afe70b0d5bd98d05bbb7afc756108f09
if (range < 0.0D || d < range * range) { if (range < 0.0D || d < range * range) {
return true; return true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java 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 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -129,8 +129,16 @@ public class PurpurConfig { @@ -129,8 +129,16 @@ public class PurpurConfig {
@@ -220,10 +220,10 @@ index 36cbaefea53a60c4a7176bf699c03e7cac338976..1b3ab9fd6a6d094d559e18a1d119e651
public boolean untamedTamablesAreRidable = true; public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false; 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 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/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; return this.spigot;
} }
// Spigot end // Spigot end

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 this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end // Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java 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 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/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 { @@ -991,6 +991,8 @@ public abstract class PlayerList {
@@ -110,10 +110,10 @@ index 1b3ab9fd6a6d094d559e18a1d119e651c411a11e..2d42f36e9f1ce6bf064588d84ed7ae52
public boolean babiesAreRidable = true; 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 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/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() { public void resetIdleTimer() {
getHandle().resetLastActionTime(); getHandle().resetLastActionTime();
} }

4
patches/server/0212-Flying-Fall-Damage-API.patch
View File

@@ -26,10 +26,10 @@ index b9ce1021f12f14ba45c49890d8d529b733bae532..48e208c332a06c56fef604920a1cb95c
} else { } else {
if (fallDistance >= 2.0F) { if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cc3750a28627a2b9def1b2cac91f43b9a0b7f2e3..563e501d658018e2503f2972df181e623592b9aa 100644 index 5e729ad8677b84be00895fb29a4e209248e3f55f..432ac0aa33e3d69a9fb640ec5ecc9edae42ea8ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2569,5 +2569,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -2570,5 +2570,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) { public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime; getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
} }