Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a70924789 [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
d1db107 Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2020-12-22 16:07:10 -06:00
parent 79d304ff80
commit 8cabaaeced
28 changed files with 116 additions and 70 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fea03568e8af3a0b355204bab0c99fdd54913688..521a9acee4fa73b4801dfe50645adcd6ddf96de4 100644
index 876288defab03457555709fabaa0bc07ba58707b..1af01a6b8a2ea0912d552880f69e7f0dfd5ec991 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2807,6 +2807,20 @@ public abstract class EntityLiving extends Entity {
@@ -2813,6 +2813,20 @@ public abstract class EntityLiving extends Entity {
this.collideNearby();
this.world.getMethodProfiler().exit();