mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 8fe5611 Fix Player#playerListName nullability annotation (#6089) 8827886 Add back linking to Adventure Javadoc (#6088) 6ea4da4 AbstractSkeleton should extend RangedEntity (#6087) a831634 add Optimize Light Engine patch (#5863) 56fd1a2 Update to Minecraft 1.17.1 (#6097) f8d6cbd Deobfuscate stacktraces in sync load info (#6103) Tuinity Changes: 5065deb Make CollisionContext initialisation lazy 388bdf5 Optimise ActivationRange#activateEntities again 2310a94 Update to 1.17.1
This commit is contained in:
@@ -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 936213c774400c5fc6f7e28cbaafb79c67ddf3e7..a75b0a7d8bbb6ed0871865c70b5a5256a4c61cbe 100644
|
||||
index f3304cefa0a8862ef27dcb00519a8a3b9b94da26..0615c4cc3ada4673cb44eaafc4c7fbe189fb1093 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -2560,7 +2560,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
@@ -2749,7 +2749,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
}
|
||||
|
||||
this.processPortalCooldown();
|
||||
|
||||
Reference in New Issue
Block a user