Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +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@ef0e5a6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2022-09-13 17:32:56 -05:00
parent 664774af5a
commit 6e7bb8323f
40 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0187-Add-toggle-for-end-portal-safe-teleporting.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index f6d5d0ebc598d57a5476dbbd47b930d76d27cce7..ebe13267573fbf04d11143a6fcbed3d1a8b2ee5d 100644
index 4e5b2704f22ac8e94c8ec3b7bfe1e755207eb8cb..a49cc52d5181c56159cbab14c5bec2d7e55c5396 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2934,7 +2934,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2948,7 +2948,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.processPortalCooldown();
@@ -45,7 +45,7 @@ index 04bae5085756842ce88710646a17e9dc1aad5994..e7658fa9806701505e15cbf1d28ea3bd
entity.portalWorld = ((ServerLevel)world);
entity.portalBlock = pos.immutable();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6d6b3105e8fe2f69ef8d8b94ee22b7f3bce4416f..dd632b6282eeded3941a9f55d543017d573d1b99 100644
index c8832718ab8862218fb59ff883fffda24137f675..9789e3af3fe327046b70da504c6bc44d092ed6b0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -633,6 +633,11 @@ public class PurpurWorldConfig {