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@efd47e3 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9188)
PaperMC/Paper@1edfefd Add option to flush region files on save (#9149)
PaperMC/Paper@9daa019 Added wither vanilla invulnerability API (#9124)
This commit is contained in:
granny
2023-05-12 22:22:02 -07:00
parent 84da84887e
commit 3325421436
79 changed files with 323 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0130-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 a7f674f456be825bbabb2c86c93afde77db96a33..fad36f2d2a302a2da1c5bd9d199437e9489349b9 100644
index 06c225972d5a92296042ff612634f81298b32107..9610ab9ba4803f6841c797f740ac5cdc758a70e3 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1228,6 +1228,7 @@ public class ServerPlayer extends Player {
@@ -1230,6 +1230,7 @@ public class ServerPlayer extends Player {
playerlist.sendPlayerPermissionLevel(this);
worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
this.unsetRemoved();
@@ -17,10 +17,10 @@ index a7f674f456be825bbabb2c86c93afde77db96a33..fad36f2d2a302a2da1c5bd9d199437e9
// 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 a59d5b1aa9ff67830f521ea3ff1d27e7874ba4bb..bfc65117bb9223799a8daee00f3c6833f10e4900 100644
index a1be9f2cbc2d66f9d4c5a66dc8a620435f9073a5..fe44c47c5dea658cb812923ecc284671a15d3d24 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2937,12 +2937,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2938,12 +2938,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return Vec3.directionFromRotation(this.getRotationVector());
}