Updated Upstream (Paper, Tuinity, & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
3dcbdc73b Fix force upgrade patch (#5699)
dab6ec6cd List all missing hard depends not just first (#5673)
aed5031e3 Fix/Optimize world and light datafixes (#5693)
719040d92 [Auto] Updated Upstream (CraftBukkit)
6c183f1ae [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
f88659c8e Fix and optimise world force upgrading

Airplane Changes:
7f3b09178 Move check
040fa19eb Better checking for useless move packets
5fab6a257 Improvements to fluid & profiler patches
046ae543c Improve hopper performance via bitset
4a221843f Update Upstream (Tuinity)
This commit is contained in:
BillyGalbreath
2021-05-21 04:25:41 -05:00
parent 1808888a40
commit af2dd61af0
25 changed files with 735 additions and 207 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Ridables
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b268068b5d2bc5f0d032e11ac38bf011a32df01c..ad4e1d5154bebf7458c38bed7380f12d06c3eaaf 100644
index cbc6d074a7366f6456c6af2a3fedf0f7bd40cb5b..8ba25be0ea59483e824be9afc63d47cb75b5b334 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1541,6 +1541,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1543,6 +1543,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
WorldServer worldserver = (WorldServer) iterator.next();
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
worldserver.hasEntityMoveEvent = EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -104,7 +104,7 @@ index b3d12463fbeb2045860c6b933da74980f778472e..d06bae9d71f23fccbfaf65c0fd9e9a55
public void playerTick() {
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index ff704bc64146584d3e8085b332bada39912f71f3..faf6140085454b4e29869d6abe08353b7a301287 100644
index a3bd84427b81e8f0409d6f5fcbbf397b12532afd..29f1353482ac93cc5eb59a0f7bd8b7e631271520 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -216,6 +216,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -5590,10 +5590,10 @@ index 96efd974f1eb9c1e7c70e576e51ed69e15aacb99..fc86ef53c48503139667f7703019a07c
default int getHeight() {
diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
index 056d827a2115370c01d0f2a98039f727b4c674d5..36b416636b4ded816701a065ff2ff0c3890e0987 100644
index 66dadc03972020810e7b4c76188f536cad8149cf..0488b69f7b0bd4bf7d23488b7df615f515fa5d0b 100644
--- a/src/main/java/net/minecraft/world/level/World.java
+++ b/src/main/java/net/minecraft/world/level/World.java
@@ -1833,5 +1833,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1845,5 +1845,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public boolean isTheEnd() {
return getWorld().getEnvironment() == org.bukkit.World.Environment.THE_END;
}