Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9797f08 Sync Starlight SaveUtil with 1.1.1
PaperMC/Paper@ed9cf5c Fix missing null check in ChunkGenerator#findNearestMapStructure
PaperMC/Paper@fb2c24b Updated Upstream (Bukkit/CraftBukkit) (#8015)

Pufferfish Changes:
pufferfish-gg/Pufferfish@892ec46 Fix minecart loading bug. PurpurMC/Purpur#1008
pufferfish-gg/Pufferfish@8780a38 Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2022-06-20 23:09:28 -05:00
parent def1bd407d
commit 4f47e9c368
19 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0142-Dont-run-with-scissors.patch
View File

@@ -55,10 +55,10 @@ index c4088446d30c3b25cf196f51fd394cd056be0495..8b03b8e58e16ab9b677ba14cf1d09b41
private boolean bypassArmor;
private boolean bypassInvul;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index d437630610b3561029a88a075ab3ed0ad3abcfe2..019e095647225f3d61f0759c8787171a45acdaca 100644
index cc0f6a51e10c77928fccf372a45a56aa6f2b298a..f4ca0a9481533befc78cb18c1f9810826f57562c 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1130,6 +1130,10 @@ public class CraftEventFactory {
@@ -1131,6 +1131,10 @@ public class CraftEventFactory {
cause = DamageCause.FREEZE;
} else if (source == DamageSource.GENERIC) {
cause = DamageCause.CUSTOM;
@@ -70,7 +70,7 @@ index d437630610b3561029a88a075ab3ed0ad3abcfe2..019e095647225f3d61f0759c8787171a
if (cause != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index f04eeaf631ccd8a4445c8401c0eb2eac51bdddc2..b0bd88370ad1693afc52a69c5d0d0446027d4189 100644
index 68ae78e98df34849e0a3c97d27b26d0f45cf4bb7..6f7744083bcbf40b5c92f1cbfa973f6118a7ed7c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -177,6 +177,7 @@ public class PurpurConfig {
@@ -95,7 +95,7 @@ index f04eeaf631ccd8a4445c8401c0eb2eac51bdddc2..b0bd88370ad1693afc52a69c5d0d0446
public static String serverModName = "Purpur";
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e10c925f5dbbe9ac73824e12446cd86c3d8b7188..c5d4aeb82f41d28ec36e484faf5b453667e63723 100644
index 1cd729673126802d7778f251185077158833954d..af3fc93759abf435119e4bf4149be2cc1545ec5a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -194,6 +194,8 @@ public class PurpurWorldConfig {