Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57: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@41ab602 [ci skip] couple more fixes for build pr jar label (#8599)
PaperMC/Paper@c40f8d5 Sync offhand slot in menus (#7341)
PaperMC/Paper@425baed Fully deserialise persistent anger post async load (#8560)
PaperMC/Paper@ec6a9a3 Updated Upstream (Bukkit/CraftBukkit) (#8604)
PaperMC/Paper@96fdafd Player Entity Tracking Events (#4722)
PaperMC/Paper@407a445 Fix dumplisteners missing folder creation
PaperMC/Paper@b07d5e0 Limit pet look distance (#8612)
PaperMC/Paper@476ef25 Add missing Fluid type (#8608)
This commit is contained in:
Encode42
2022-12-07 12:05:48 -05:00
parent 86f2da583b
commit 482a83ff9f
21 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ 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 eaf78967480585b57dece2f791f38609c08339d7..67d466b084b30c57898a6eae773c09daa78ca849 100644
index 43e69bcf6910f06bc70f575376e3c4402bfe6837..236b95fc8dfe0157e5af2b2a20973a9e36b9c604 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1188,6 +1188,7 @@ public class ServerPlayer extends Player {
@@ -1195,6 +1195,7 @@ public class ServerPlayer extends Player {
playerlist.sendPlayerPermissionLevel(this);
worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
this.unsetRemoved();
@@ -17,7 +17,7 @@ index eaf78967480585b57dece2f791f38609c08339d7..67d466b084b30c57898a6eae773c09da
// 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 5622d3a0732c3006cd9de90b62dec741da0caac4..c8d08fb02eefee08799661423fd4342f05f1b8f2 100644
index a9967badea51c9821957e774d2eee4dfbd285afb..d1d1fb22b75003e53766947ba421073654eed726 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2890,12 +2890,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -37,7 +37,7 @@ index 5622d3a0732c3006cd9de90b62dec741da0caac4..c8d08fb02eefee08799661423fd4342f
this.isInsidePortal = true;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 97143ad57276e7f62b50578096972c7581a6158b..4e996becabad942aaaa5ccb097707b0e2fd83adb 100644
index a0591dd2f5b438e04264b4ba9628d85ca0318224..bfe540637ec08d098a3b9e951b2d88fd4f618f1a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -338,6 +338,7 @@ public class PurpurWorldConfig {