Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@1c779c2 Update to 1.18.1 (#7076)
PaperMC/Paper@901fd94 [ci skip] Update README
This commit is contained in:
Encode42
2021-12-10 16:04:19 -05:00
parent 26e5f080f2
commit 1fd37bdec4
26 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ 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 5404735daf4d914d6981bc3c0ebafe087f8b6f37..2380bab916cf628c928675229db0bbae76db92e2 100644
index 6d8a12b0d568f87ea7d8e38ba75e0544db5078e9..6772febede955704eba60d4e3a0ca4b60485e4ad 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1573,6 +1573,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1574,6 +1574,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
this.player.resetFallDistance();
}
@@ -22,7 +22,7 @@ index 5404735daf4d914d6981bc3c0ebafe087f8b6f37..2380bab916cf628c928675229db0bbae
this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5);
this.lastGoodX = this.player.getX();
this.lastGoodY = this.player.getY();
@@ -1606,6 +1613,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1607,6 +1614,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
}
// Paper end - optimise out extra getCubes
@@ -56,7 +56,7 @@ index 600b9e9bc6a9c92920c8ec28764e64dfc1fd6e3f..47eb362ba73bb20e738af6dea60e86ff
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 2088887b61bfc02e1d00e645682879123df30e68..a34471e1164803565a4746284da4a75aa10274e8 100644
index 088415ebd74e75a2e6917adb97e23e019c07f294..71a8f7960bc60626d88dc0e258d47db41c7b8cb8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -157,6 +157,8 @@ public class PurpurWorldConfig {