mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 808bd9198 Add fast alternative constructor for Vector3f (#5339) e849c51da fix #5336 0b25bacfc fix patch 'Remove streams from SensorNearest' (fixes #5330) 4d287e31c Use Adventure for `/version` command feedback, add copy to clipboard click event (#5333) Tuinity Changes: 5b6d8beec: Update Upstream (Paper) 81d5fc1dd: Fix NPE in pickup logic for arrow 19ac6608f: Move region chunk unload & poi unload hook up 38ad5a1bd: Do not run close logic for inventories on chunk load fb75a6f83: Do not allow the server to unload chunks at request of plugins f87cb795f: Make entity tracker use highest range of passengers 71b089f18: Do not run raytrace logic for AIR 09e1a1036: Fix NPE in light exception handler 0ae7c2c23: Dump even more info for ticking entities 2e4a930c4: Store changed positions inside field on light engine 7734ef0a9: Detail player ticking in watchdog dumps
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 68e019869c3a5907a63cbed59958b25a028d349e..9718812a3b5b4fe68c55390a52f7686cd78e44cd 100644
|
||||
index 85ffb2e72dbf08604c004732f17aee9ec7e1ff9d..49a1447bae91294a23ccab27c2809bea0c4c90a3 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -2411,12 +2411,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -2424,12 +2424,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
return new Vec2F(this.pitch, this.yaw);
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ index 68e019869c3a5907a63cbed59958b25a028d349e..9718812a3b5b4fe68c55390a52f7686c
|
||||
|
||||
this.inPortal = true;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index 0e5581e363f80735549cfbc5259eb044828e483b..67f822e64013540dd890e0269c8f770f7c029405 100644
|
||||
index dae7411e408df0a351c753d6eb3e2319f6499368..c71485943b938cf1de9f1ae05ea5cafd51a58aa2 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -1161,6 +1161,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
|
||||
Reference in New Issue
Block a user