From 75f99ec7c5c3d7281d73f03d79e3339abcb59faa Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jun 2016 11:54:17 +1000 Subject: Update to Minecraft 1.10.2 --- nms-patches/BlockSoil.patch | 4 ++-- nms-patches/DataWatcher.patch | 6 +++--- nms-patches/DedicatedServer.patch | 2 +- nms-patches/EnderDragonBattle.patch | 20 -------------------- nms-patches/EntityPotion.patch | 2 +- nms-patches/HandshakeListener.patch | 2 +- nms-patches/World.patch | 28 ++++++++++++++-------------- pom.xml | 2 +- 8 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 nms-patches/EnderDragonBattle.patch diff --git a/nms-patches/BlockSoil.patch b/nms-patches/BlockSoil.patch index 96deb823..c8396b93 100644 --- a/nms-patches/BlockSoil.patch +++ b/nms-patches/BlockSoil.patch @@ -12,7 +12,7 @@ public class BlockSoil extends Block { public static final BlockStateInteger MOISTURE = BlockStateInteger.of("moisture", 0, 7); -@@ -40,6 +45,12 @@ +@@ -35,6 +40,12 @@ if (i > 0) { world.setTypeAndData(blockposition, iblockdata.set(BlockSoil.MOISTURE, Integer.valueOf(i - 1)), 2); } else if (!this.b(world, blockposition)) { @@ -25,7 +25,7 @@ world.setTypeUpdate(blockposition, Blocks.DIRT.getBlockData()); } } else if (i < 7) { -@@ -49,11 +60,31 @@ +@@ -44,11 +55,31 @@ } public void fallOn(World world, BlockPosition blockposition, Entity entity, float f) { diff --git a/nms-patches/DataWatcher.patch b/nms-patches/DataWatcher.patch index 251f284c..131d78a7 100644 --- a/nms-patches/DataWatcher.patch +++ b/nms-patches/DataWatcher.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/DataWatcher.java +++ b/net/minecraft/server/DataWatcher.java -@@ -55,7 +55,7 @@ +@@ -70,7 +70,7 @@ } } @@ -9,7 +9,7 @@ int i = datawatcherobject.a(); if (i > 254) { -@@ -69,7 +69,7 @@ +@@ -84,7 +84,7 @@ } } @@ -17,4 +17,4 @@ + private void registerObject(DataWatcherObject datawatcherobject, Object t0) { // CraftBukkit Object DataWatcher.Item datawatcher_item = new DataWatcher.Item(datawatcherobject, t0); - this.d.writeLock().lock(); + this.e.writeLock().lock(); diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch index 98760e54..6d42a7a3 100644 --- a/nms-patches/DedicatedServer.patch +++ b/nms-patches/DedicatedServer.patch @@ -110,7 +110,7 @@ + thread.setDaemon(true); thread.start(); - DedicatedServer.LOGGER.info("Starting minecraft server version 1.10"); + DedicatedServer.LOGGER.info("Starting minecraft server version 1.10.2"); @@ -78,7 +124,7 @@ } diff --git a/nms-patches/EnderDragonBattle.patch b/nms-patches/EnderDragonBattle.patch deleted file mode 100644 index d7871f70..00000000 --- a/nms-patches/EnderDragonBattle.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/net/minecraft/server/EnderDragonBattle.java -+++ b/net/minecraft/server/EnderDragonBattle.java -@@ -246,7 +246,7 @@ - ShapeDetector.ShapeDetectorCollection shapedetector_shapedetectorcollection = this.f.a(this.d, tileentity.getPosition()); - - if (shapedetector_shapedetectorcollection != null) { -- BlockPosition blockposition = shapedetector_shapedetectorcollection.a(3, 3, 4).getPosition(); -+ BlockPosition blockposition = shapedetector_shapedetectorcollection.a(3, 3, 3).getPosition(); // CraftBukkit - 4 -> 3 - - if (this.o == null && blockposition.getX() == 0 && blockposition.getZ() == 0) { - this.o = blockposition; -@@ -266,7 +266,7 @@ - - if (shapedetector_shapedetectorcollection1 != null) { - if (this.o == null) { -- this.o = shapedetector_shapedetectorcollection1.a(3, 3, 4).getPosition(); -+ this.o = shapedetector_shapedetectorcollection1.a(3, 3, 3).getPosition(); // CraftBukkit - 4 -> 3 - } - - return shapedetector_shapedetectorcollection1; diff --git a/nms-patches/EntityPotion.patch b/nms-patches/EntityPotion.patch index 07c28cea..b6831b1a 100644 --- a/nms-patches/EntityPotion.patch +++ b/nms-patches/EntityPotion.patch @@ -13,7 +13,7 @@ + public class EntityPotion extends EntityProjectile { - private static final DataWatcherObject> d = DataWatcher.a(EntityItem.class, DataWatcherRegistry.f); + private static final DataWatcherObject> d = DataWatcher.a(EntityPotion.class, DataWatcherRegistry.f); @@ -78,10 +85,11 @@ this.world.triggerEffect(2002, new BlockPosition(this), PotionRegistry.a(potionregistry)); this.die(); diff --git a/nms-patches/HandshakeListener.patch b/nms-patches/HandshakeListener.patch index c408ba7c..5d301b04 100644 --- a/nms-patches/HandshakeListener.patch +++ b/nms-patches/HandshakeListener.patch @@ -58,7 +58,7 @@ + // CraftBukkit end + if (packethandshakinginsetprotocol.b() > 210) { - chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.10"); + chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.10.2"); this.b.sendPacket(new PacketLoginOutDisconnect(chatcomponenttext)); @@ -26,6 +71,7 @@ this.b.close(chatcomponenttext); 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 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; diff --git a/pom.xml b/pom.xml index f0f21ec2..22e67757 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.bukkit craftbukkit jar - 1.10-R0.1-SNAPSHOT + 1.10.2-R0.1-SNAPSHOT CraftBukkit http://www.bukkit.org -- cgit v1.2.3