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:
PaperMC/Paper@c919e94 Updated Upstream (Bukkit/CraftBukkit) (#8663)
This commit is contained in:
BillyGalbreath
2022-12-14 12:21:08 -06:00
parent db7d41a7dd
commit 0a4b64fbe6
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0134-Dont-run-with-scissors.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 22c35d1e16bed3b9c16d776ffe1621c3fe21f58f..5c09d0bbe552af208cb0443699c20639d67db566 100644
index 8178fea5507ad916a7b3344eaacc99c85c69b56c..b3eb63c530dacb2ff271d033f2e577c36b939c94 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1687,6 +1687,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -55,10 +55,10 @@ index f2ef4d93e070167d70f597e8893bf29b53433a28..f3a682fdc1c9ba24a9532c6c17ea3c4e
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 b53d824bc0f964349e70097285700e5facd3bcdf..07ecccf5eddb0088e5409b3bb8a6b3c1883189d2 100644
index 7c2922c35f85be346a359d691a0c77c7c3a24726..86c49b8d3b0059bba6a78a17d870aff4568b39e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1132,6 +1132,10 @@ public class CraftEventFactory {
@@ -1133,6 +1133,10 @@ public class CraftEventFactory {
cause = DamageCause.FREEZE;
} else if (source == DamageSource.GENERIC) {
cause = DamageCause.CUSTOM;
@@ -70,7 +70,7 @@ index b53d824bc0f964349e70097285700e5facd3bcdf..07ecccf5eddb0088e5409b3bb8a6b3c1
if (cause != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 0507a090fb9122fdda4111fbd2ad3c51e4ef5c36..0d40cd506342c006bddc769c57f11d34ccb00dc7 100644
index 5b0625955e2a65f689c8a128d73170bc1f0c8025..c8097ec7887ac8e689b6843d9ff7744d6a453478 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -182,6 +182,7 @@ public class PurpurConfig {
@@ -95,7 +95,7 @@ index 0507a090fb9122fdda4111fbd2ad3c51e4ef5c36..0d40cd506342c006bddc769c57f11d34
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 ec110add6bd3ad89b9a542edfd7b2014930b2702..d6dc72598aa1481419ccdf176b67f3bb37437505 100644
index 44dc44f0959c65ea4a856e39c3ca23270a9c4631..f0008bc35678c9894dbac62b4d083e89b290351b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -200,6 +200,8 @@ public class PurpurWorldConfig {