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

@@ -22,7 +22,7 @@ index ac6f9d9e52..d874b177b4 100644
public ControllerMove(EntityInsentient entityinsentient) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index fe1c6f0c1b..fcafc9e31e 100644
index 2d49816311..d14e4b1eef 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -43,7 +43,7 @@ index fe1c6f0c1b..fcafc9e31e 100644
public boolean positionChanged;
public boolean v;
public boolean velocityChanged;
@@ -2213,6 +2213,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2202,6 +2202,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(entity, false);
}
@@ -51,7 +51,7 @@ index fe1c6f0c1b..fcafc9e31e 100644
public boolean a(Entity entity, boolean flag) {
for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
if (entity1.vehicle == this) {
@@ -2307,7 +2308,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2296,7 +2297,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
@@ -66,7 +66,7 @@ index fe1c6f0c1b..fcafc9e31e 100644
}
return true; // CraftBukkit
}
@@ -2348,6 +2355,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2337,6 +2344,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -79,7 +79,7 @@ index fe1c6f0c1b..fcafc9e31e 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2739,6 +2752,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2728,6 +2741,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -87,7 +87,7 @@ index fe1c6f0c1b..fcafc9e31e 100644
public void l(float f) {}
public boolean bH() {
@@ -3152,6 +3166,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3141,6 +3155,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -106,7 +106,7 @@ index fe1c6f0c1b..fcafc9e31e 100644
@Override
public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
@@ -3591,4 +3617,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3580,4 +3606,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}