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 & Pufferfish)

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

Paper Changes:
PaperMC/Paper@0c1643c Fix MC-252439 (#7994)
PaperMC/Paper@0ae78d3 Fix advancement saving before reloads (#8003)
PaperMC/Paper@f428887 Prevent empty items from being added to world (#7998)
PaperMC/Paper@dd61319 Couple fixes for command blocks (#8004)
PaperMC/Paper@d1b1c6f Add missing deprecation to AdvancementDisplayType (#7876)
PaperMC/Paper@81f2eec [ci skip] rebuild patches
PaperMC/Paper@e269a0a Fix incorrect random nextLong to nextInt (#8009)
PaperMC/Paper@b77fe3a Temp: Disable javadoc.io for now
PaperMC/Paper@7688112 [ci skip] restore jd.io
PaperMC/Paper@b0eb4e0 Fix number parsing (#8013)

Pufferfish Changes:
pufferfish-gg/Pufferfish@fdfb106 Fix version checker
pufferfish-gg/Pufferfish@b4104a6 Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2022-06-18 13:19:15 -05:00
parent a92a8df112
commit def1bd407d
17 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0137-Fix-stuck-in-portals.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c65eeec4ee990a1efaf5648ca31f8bb4a178ce2b..4980b0b46e75a4bc914cb3719d8b394fbcd8c224 100644
index 1de4f239dfb63250b7143e89e97487d048b99776..bc5d5a2a48cfc6b4257d1cc3ac73d8ec5300721d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1185,6 +1185,7 @@ public class ServerPlayer extends Player {
@@ -17,10 +17,10 @@ index c65eeec4ee990a1efaf5648ca31f8bb4a178ce2b..4980b0b46e75a4bc914cb3719d8b394f
// CraftBukkit end
this.setLevel(worldserver);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e2e8128fc7a88ddf5599e6cb5dc84d5858c062e7..42822c44dbe18f1cffb269b35eb554efde59a20d 100644
index 02ac813cfa9bafd931a1fb2f31a0a3cd955cd5d7..f9111dc426a539c91665840d772258f76b6d1c76 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2865,12 +2865,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2870,12 +2870,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return Vec3.directionFromRotation(this.getRotationVector());
}
@@ -37,7 +37,7 @@ index e2e8128fc7a88ddf5599e6cb5dc84d5858c062e7..42822c44dbe18f1cffb269b35eb554ef
this.isInsidePortal = true;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a3c4433a5fe19ca6475f98214768b097e3495353..da34e98f9c62336a07d9ee16b36819ef840738d6 100644
index 804a90cfb82d194de5b0f985e04a1fa7f89c29b0..a9654a4935c625852070255e443c669bd80d332a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -332,6 +332,7 @@ public class PurpurWorldConfig {