summaryrefslogtreecommitdiffstats
path: root/nms-patches/World.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-22 12:00:00 +1000
committermd_5 <git@md-5.net>2018-07-22 12:00:00 +1000
commit1a6b4f5392c8cda1e347c10976d394b47936dda6 (patch)
tree3b27585102b8348a432064ca1f1cad1e6488f1ad /nms-patches/World.patch
parent961295e4327324766a0404857c1ca85051971995 (diff)
downloadcraftbukkit-1a6b4f5392c8cda1e347c10976d394b47936dda6.tar
craftbukkit-1a6b4f5392c8cda1e347c10976d394b47936dda6.tar.gz
craftbukkit-1a6b4f5392c8cda1e347c10976d394b47936dda6.tar.lz
craftbukkit-1a6b4f5392c8cda1e347c10976d394b47936dda6.tar.xz
craftbukkit-1a6b4f5392c8cda1e347c10976d394b47936dda6.zip
Update to Minecraft 1.13
Diffstat (limited to 'nms-patches/World.patch')
-rw-r--r--nms-patches/World.patch32
1 files changed, 16 insertions, 16 deletions
diff --git a/nms-patches/World.patch b/nms-patches/World.patch
index 93eaaad1..0ec40741 100644
--- a/nms-patches/World.patch
+++ b/nms-patches/World.patch
@@ -441,15 +441,15 @@
entity.N = entity.locX;
entity.O = entity.locY;
-@@ -967,6 +1220,7 @@
- entity.aH();
- } else {
+@@ -970,6 +1223,7 @@
+ return ((MinecraftKey) EntityTypes.REGISTRY.b(entity.P())).toString();
+ });
entity.tick();
+ entity.postTick(); // CraftBukkit
+ this.methodProfiler.e();
}
}
-
-@@ -1296,11 +1550,18 @@
+@@ -1300,11 +1554,18 @@
}
}
@@ -468,7 +468,7 @@
TileEntity tileentity = null;
if (this.J) {
-@@ -1335,6 +1596,14 @@
+@@ -1339,6 +1600,14 @@
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
if (!k(blockposition)) {
if (tileentity != null && !tileentity.x()) {
@@ -483,7 +483,7 @@
if (this.J) {
tileentity.setPosition(blockposition);
Iterator iterator = this.c.iterator();
-@@ -1494,6 +1763,14 @@
+@@ -1498,6 +1767,14 @@
}
this.p = MathHelper.a(this.p, 0.0F, 1.0F);
@@ -498,7 +498,7 @@
}
}
}
-@@ -1579,7 +1856,10 @@
+@@ -1583,7 +1860,10 @@
}
public boolean c(EnumSkyBlock enumskyblock, BlockPosition blockposition) {
@@ -510,7 +510,7 @@
return false;
} else {
int i = 0;
-@@ -1750,7 +2030,7 @@
+@@ -1754,7 +2034,7 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@@ -519,7 +519,7 @@
arraylist.add(entity);
}
}
-@@ -1765,7 +2045,7 @@
+@@ -1769,7 +2049,7 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@@ -528,7 +528,7 @@
arraylist.add(entity);
}
}
-@@ -1814,7 +2094,7 @@
+@@ -1818,7 +2098,7 @@
}
}
@@ -537,7 +537,7 @@
}
@Nullable
-@@ -1835,8 +2115,17 @@
+@@ -1839,8 +2119,17 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@@ -556,7 +556,7 @@
++i;
}
}
-@@ -1845,12 +2134,18 @@
+@@ -1849,12 +2138,18 @@
}
public void a(Collection<Entity> collection) {
@@ -576,7 +576,7 @@
this.b(entity);
}
-@@ -1954,6 +2249,11 @@
+@@ -1958,6 +2253,11 @@
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman1 = (EntityHuman) this.players.get(i);
@@ -588,7 +588,7 @@
if (predicate.test(entityhuman1)) {
double d5 = entityhuman1.d(d0, d1, d2);
-@@ -2122,6 +2422,16 @@
+@@ -2126,6 +2426,16 @@
public void everyoneSleeping() {}
@@ -605,7 +605,7 @@
public float g(float f) {
return (this.q + (this.r - this.q) * f) * this.i(f);
}
-@@ -2296,7 +2606,7 @@
+@@ -2300,7 +2610,7 @@
int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true;