From 1f8414b489ed7c84f5e101a420c4254267699507 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 12 Dec 2014 11:05:04 +1100 Subject: [PATCH] Rebuilt patches --- nms-patches/ContainerWorkbench.patch | 13 ++++---- nms-patches/Entity.patch | 46 ++++++++++++++-------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/nms-patches/ContainerWorkbench.patch b/nms-patches/ContainerWorkbench.patch index 512ff3fc5b..ea1978e95d 100644 --- a/nms-patches/ContainerWorkbench.patch +++ b/nms-patches/ContainerWorkbench.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/ContainerWorkbench.java 2014-12-09 20:39:54.821706281 +0100 -+++ src/main/java/net/minecraft/server/ContainerWorkbench.java 2014-12-09 20:39:42.000000000 +0100 +--- ../work/decompile-8eb82bde/net/minecraft/server/ContainerWorkbench.java 2014-12-12 11:04:49.302794059 +1100 ++++ src/main/java/net/minecraft/server/ContainerWorkbench.java 2014-12-12 11:04:29.771003013 +1100 @@ -1,13 +1,28 @@ package net.minecraft.server; @@ -31,7 +31,7 @@ this.g = world; this.h = blockposition; this.a((Slot) (new SlotResult(playerinventory.player, this.craftInventory, this.resultInventory, 0, 124, 35))); -@@ -35,7 +50,20 @@ +@@ -35,7 +50,21 @@ } public void a(IInventory iinventory) { @@ -44,16 +44,17 @@ + if (super.listeners.size() < 1) { + return; + } ++ // See CraftBukkit PR #39 + if (craftResult != null && craftResult.getItem() == Items.FILLED_MAP) { + return; -+ } ++ } + EntityPlayer player = (EntityPlayer) super.listeners.get(0); // TODO: Is this _always_ correct? Seems like it. + player.playerConnection.sendPacket(new PacketPlayOutSetSlot(player.activeContainer.windowId, 0, craftResult)); + // CraftBukkit end } public void b(EntityHuman entityhuman) { -@@ -53,6 +81,7 @@ +@@ -53,6 +82,7 @@ } public boolean a(EntityHuman entityhuman) { @@ -61,7 +62,7 @@ return this.g.getType(this.h).getBlock() != Blocks.CRAFTING_TABLE ? false : entityhuman.e((double) this.h.getX() + 0.5D, (double) this.h.getY() + 0.5D, (double) this.h.getZ() + 0.5D) <= 64.0D; } -@@ -101,4 +130,17 @@ +@@ -101,4 +131,17 @@ public boolean a(ItemStack itemstack, Slot slot) { return slot.inventory != this.resultInventory && super.a(itemstack, slot); } diff --git a/nms-patches/Entity.patch b/nms-patches/Entity.patch index 4fcba5c015..4356df0066 100644 --- a/nms-patches/Entity.patch +++ b/nms-patches/Entity.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/Entity.java 2014-12-11 00:40:13.568254452 +0000 -+++ src/main/java/net/minecraft/server/Entity.java 2014-12-11 00:38:28.556255592 +0000 +--- ../work/decompile-8eb82bde/net/minecraft/server/Entity.java 2014-12-12 11:04:49.470792233 +1100 ++++ src/main/java/net/minecraft/server/Entity.java 2014-12-12 11:03:57.000000000 +1100 @@ -6,8 +6,40 @@ import java.util.UUID; import java.util.concurrent.Callable; @@ -60,7 +60,7 @@ if (f != this.width || f1 != this.length) { float f2 = this.width; -@@ -150,6 +184,33 @@ +@@ -150,6 +185,33 @@ } protected void setYawPitch(float f, float f1) { @@ -94,7 +94,7 @@ this.yaw = f % 360.0F; this.pitch = f1 % 360.0F; } -@@ -186,7 +247,7 @@ +@@ -186,7 +248,7 @@ int i = this.L(); if (this.ak) { @@ -103,7 +103,7 @@ if (this.vehicle == null && this.al++ >= i) { this.al = i; this.portalCooldown = this.ar(); -@@ -263,6 +324,27 @@ +@@ -263,6 +325,27 @@ protected void burnFromLava() { if (!this.fireProof) { this.damageEntity(DamageSource.LAVA, 4.0F); @@ -131,7 +131,7 @@ this.setOnFire(15); } } -@@ -300,6 +382,22 @@ +@@ -300,6 +383,22 @@ this.a(this.getBoundingBox().c(d0, d1, d2)); this.recalcPosition(); } else { @@ -154,7 +154,7 @@ this.world.methodProfiler.a("move"); double d3 = this.locX; double d4 = this.locY; -@@ -520,6 +618,26 @@ +@@ -520,6 +619,26 @@ block.a(this.world, this); } @@ -181,7 +181,7 @@ if (this.r_() && !flag && this.vehicle == null) { double d21 = this.locX - d3; double d22 = this.locY - d4; -@@ -530,7 +648,7 @@ +@@ -530,7 +649,7 @@ } if (block != null && this.onGround) { @@ -190,7 +190,7 @@ } this.M = (float) ((double) this.M + (double) MathHelper.sqrt(d21 * d21 + d23 * d23) * 0.6D); -@@ -548,9 +666,12 @@ +@@ -548,9 +667,12 @@ } this.a(blockposition, block); @@ -203,7 +203,7 @@ try { this.checkBlockCollisions(); } catch (Throwable throwable) { -@@ -560,6 +681,8 @@ +@@ -560,6 +682,8 @@ this.appendEntityCrashDetails(crashreportsystemdetails); throw new ReportedException(crashreport); } @@ -212,7 +212,7 @@ boolean flag2 = this.U(); -@@ -567,7 +690,16 @@ +@@ -567,7 +691,16 @@ this.burn(1); if (!flag2) { ++this.fireTicks; @@ -230,7 +230,7 @@ this.setOnFire(8); } } -@@ -673,7 +805,7 @@ +@@ -673,7 +806,7 @@ return null; } @@ -239,7 +239,7 @@ if (!this.fireProof) { this.damageEntity(DamageSource.FIRE, (float) i); } -@@ -823,6 +955,13 @@ +@@ -823,6 +956,13 @@ } public void spawnIn(World world) { @@ -253,7 +253,7 @@ this.world = world; } -@@ -1015,6 +1154,18 @@ +@@ -1015,6 +1155,18 @@ try { nbttagcompound.set("Pos", this.a(new double[] { this.locX, this.locY, this.locZ})); nbttagcompound.set("Motion", this.a(new double[] { this.motX, this.motY, this.motZ})); @@ -272,7 +272,7 @@ nbttagcompound.set("Rotation", this.a(new float[] { this.yaw, this.pitch})); nbttagcompound.setFloat("FallDistance", this.fallDistance); nbttagcompound.setShort("Fire", (short) this.fireTicks); -@@ -1025,6 +1176,11 @@ +@@ -1025,6 +1177,11 @@ nbttagcompound.setInt("PortalCooldown", this.portalCooldown); nbttagcompound.setLong("UUIDMost", this.getUniqueID().getMostSignificantBits()); nbttagcompound.setLong("UUIDLeast", this.getUniqueID().getLeastSignificantBits()); @@ -284,7 +284,7 @@ if (this.getCustomName() != null && this.getCustomName().length() > 0) { nbttagcompound.setString("CustomName", this.getCustomName()); nbttagcompound.setBoolean("CustomNameVisible", this.getCustomNameVisible()); -@@ -1062,6 +1218,7 @@ +@@ -1062,6 +1219,7 @@ this.motX = nbttaglist1.d(0); this.motY = nbttaglist1.d(1); this.motZ = nbttaglist1.d(2); @@ -292,7 +292,7 @@ if (Math.abs(this.motX) > 10.0D) { this.motX = 0.0D; } -@@ -1073,6 +1230,7 @@ +@@ -1073,6 +1231,7 @@ if (Math.abs(this.motZ) > 10.0D) { this.motZ = 0.0D; } @@ -300,7 +300,7 @@ this.lastX = this.P = this.locX = nbttaglist.d(0); this.lastY = this.Q = this.locY = nbttaglist.d(1); -@@ -1105,7 +1263,57 @@ +@@ -1105,7 +1264,57 @@ if (this.af()) { this.setPosition(this.locX, this.locY, this.locZ); } @@ -358,7 +358,7 @@ } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded"); -@@ -1167,6 +1375,12 @@ +@@ -1167,6 +1376,12 @@ public EntityItem a(ItemStack itemstack, float f) { if (itemstack.count != 0 && itemstack.getItem() != null) { @@ -371,7 +371,7 @@ EntityItem entityitem = new EntityItem(this.world, this.locX, this.locY + (double) f, this.locZ, itemstack); entityitem.p(); -@@ -1276,16 +1490,76 @@ +@@ -1276,16 +1491,76 @@ } public void mount(Entity entity) { @@ -448,7 +448,7 @@ if (this.vehicle != null) { this.vehicle.passenger = null; } -@@ -1406,10 +1680,50 @@ +@@ -1406,10 +1681,50 @@ } public void onLightningStrike(EntityLightning entitylightning) { @@ -500,7 +500,7 @@ } } -@@ -1546,32 +1860,78 @@ +@@ -1546,32 +1861,78 @@ if (!this.world.isStatic && !this.dead) { this.world.methodProfiler.a("changeDimension"); MinecraftServer minecraftserver = MinecraftServer.getServer(); @@ -584,7 +584,7 @@ } this.dead = true; -@@ -1680,8 +2040,27 @@ +@@ -1680,8 +2041,27 @@ return this.boundingBox; }