Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

Browse Source 
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:
William Blake Galbreath
2021-07-07 04:04:58 -05:00
parent 045bcb4ea9
commit 2040a9ac8a
73 changed files with 19485 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0155-Fix-stuck-in-portals.patch
View File

@@ -5,7 +5,7 @@ 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 85d2fda86638075130def6a47912682637186d84..6e9d011dd855a5fcb9fb603751a1dff434db7fe0 100644
index b52cea07a77bd5124881e144483e148cbf5ad54d..4e8333d134b05bdf45356d14b974b8de013cb6d2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1137,6 +1137,7 @@ public class ServerPlayer extends Player {
@@ -17,10 +17,10 @@ index 85d2fda86638075130def6a47912682637186d84..6e9d011dd855a5fcb9fb603751a1dff4
// 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 c220dbe126f754b3acb35559855df5f577ca4801..e87e30d6ff41ca1097b61729a8f3f678119d6007 100644
index 60986fbef5d31ae59187d51b5686126f797d3970..3c0979e7031fb33257b5ec1efcb68882ab96efcd 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2509,12 +2509,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2698,12 +2698,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
return Vec3.directionFromRotation(this.getRotationVector());
}