summaryrefslogtreecommitdiffstats
path: root/nms-patches/World.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-06-25 11:54:17 +1000
committermd_5 <git@md-5.net>2016-06-25 11:54:17 +1000
commit75f99ec7c5c3d7281d73f03d79e3339abcb59faa (patch)
tree7e37819d14923bb7d3fde7fa8461c1a04a432099 /nms-patches/World.patch
parent1953f52da1ece0feb56dea20592c1b86616b31a5 (diff)
downloadcraftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.tar
craftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.tar.gz
craftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.tar.lz
craftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.tar.xz
craftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.zip
Update to Minecraft 1.10.2
Diffstat (limited to 'nms-patches/World.patch')
-rw-r--r--nms-patches/World.patch28
1 files changed, 14 insertions, 14 deletions
diff --git a/nms-patches/World.patch b/nms-patches/World.patch
index 66a3bd5a..23fffec4 100644
--- a/nms-patches/World.patch
+++ b/nms-patches/World.patch
@@ -434,7 +434,7 @@
}
}
}
-@@ -1240,7 +1484,10 @@
+@@ -1247,7 +1491,10 @@
int j = MathHelper.floor(entity.locZ);
boolean flag1 = true;
@@ -446,7 +446,7 @@
entity.M = entity.locX;
entity.N = entity.locY;
entity.O = entity.locZ;
-@@ -1579,11 +1826,18 @@
+@@ -1586,11 +1833,18 @@
}
}
@@ -465,7 +465,7 @@
TileEntity tileentity = null;
if (this.M) {
-@@ -1618,6 +1872,14 @@
+@@ -1625,6 +1879,14 @@
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
if (!this.E(blockposition)) {
if (tileentity != null && !tileentity.x()) {
@@ -480,7 +480,7 @@
if (this.M) {
tileentity.setPosition(blockposition);
Iterator iterator = this.b.iterator();
-@@ -1773,6 +2035,14 @@
+@@ -1780,6 +2042,14 @@
}
this.o = MathHelper.a(this.o, 0.0F, 1.0F);
@@ -495,7 +495,7 @@
}
}
}
-@@ -1904,7 +2174,10 @@
+@@ -1911,7 +2181,10 @@
}
public boolean c(EnumSkyBlock enumskyblock, BlockPosition blockposition) {
@@ -507,7 +507,7 @@
return false;
} else {
int i = 0;
-@@ -2071,7 +2344,7 @@
+@@ -2078,7 +2351,7 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@@ -516,7 +516,7 @@
arraylist.add(entity);
}
}
-@@ -2086,7 +2359,7 @@
+@@ -2093,7 +2366,7 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@@ -525,7 +525,7 @@
arraylist.add(entity);
}
}
-@@ -2135,7 +2408,7 @@
+@@ -2142,7 +2415,7 @@
}
}
@@ -534,7 +534,7 @@
}
@Nullable
-@@ -2156,8 +2429,17 @@
+@@ -2163,8 +2436,17 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@@ -554,7 +554,7 @@
++i;
}
}
-@@ -2166,12 +2448,18 @@
+@@ -2173,12 +2455,18 @@
}
public void a(Collection<Entity> collection) {
@@ -574,7 +574,7 @@
this.b(entity);
}
-@@ -2185,7 +2473,13 @@
+@@ -2192,7 +2480,13 @@
IBlockData iblockdata = this.getType(blockposition);
AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().d(this, blockposition);
@@ -589,7 +589,7 @@
}
public int K() {
-@@ -2288,6 +2582,11 @@
+@@ -2295,6 +2589,11 @@
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman1 = (EntityHuman) this.players.get(i);
@@ -601,7 +601,7 @@
if ((IEntitySelector.d.apply(entityhuman1) || !flag) && (IEntitySelector.e.apply(entityhuman1) || flag)) {
double d5 = entityhuman1.e(d0, d1, d2);
-@@ -2456,6 +2755,16 @@
+@@ -2463,6 +2762,16 @@
public void everyoneSleeping() {}
@@ -618,7 +618,7 @@
public float h(float f) {
return (this.p + (this.q - this.p) * f) * this.j(f);
}
-@@ -2673,7 +2982,7 @@
+@@ -2680,7 +2989,7 @@
int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true;