Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
abca14ff9 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
jmp
2020-12-21 00:45:03 -08:00
parent 25c7772584
commit 3b18ff8cb9
28 changed files with 68 additions and 75 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f..01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc 100644
index 97035ae751f9fcbd71aea18d15671df001fac6d3..a6293ead3f1fc7a95280c622e0dec7021800e0e1 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1521,6 +1521,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,10 +17,10 @@ index bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f..01cb91589912e1d3e4b1edf9cdc8fabf
public void f(double d0, double d1, double d2) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index a4d26d39a3d624dd11364b09aec1b408d4624ee5..aafaafb4f28ea95fca8ff62a6d6cfaf0b2fb42d0 100644
index e83f82a5dc759cab34fb890bbefcb2a2775168d3..8d2586be431fb5ae828e822a2aaa9b7102f9a352 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2477,7 +2477,7 @@ public abstract class EntityLiving extends Entity {
@@ -2483,7 +2483,7 @@ public abstract class EntityLiving extends Entity {
}
}