Updated Upstream (Tuinity)

Upstream has released updates that appears to apply and compile correctly

    Tuinity Changes:
    7c749dc Variety of small optimisations
This commit is contained in:
William Blake Galbreath
2020-07-07 09:43:21 -05:00
parent 8adc57fb34
commit 2b17a5ea89
9 changed files with 447 additions and 280 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 835975fbc3..04f732428b 100644
index 145e0a7165..9b69073f9a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1714,6 +1714,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1703,6 +1703,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean isCollidable() {
@@ -74,7 +74,7 @@ index ee7a2fedde..c9ab80ccd1 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 5c4608b7e8..18a49e69a1 100644
index 7aadccfc53..7a4b5670d4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2854,7 +2854,7 @@ public abstract class EntityLiving extends Entity {