From 5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 14 May 2017 12:00:00 +1000 Subject: Update to Minecraft 1.12-pre2 --- nms-patches/CommandTp.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nms-patches/CommandTp.patch') diff --git a/nms-patches/CommandTp.patch b/nms-patches/CommandTp.patch index 9704499c..73ec32da 100644 --- a/nms-patches/CommandTp.patch +++ b/nms-patches/CommandTp.patch @@ -2,7 +2,7 @@ +++ b/net/minecraft/server/CommandTp.java @@ -53,17 +53,11 @@ } else { - Entity entity = b(minecraftserver, icommandlistener, astring[astring.length - 1]); + Entity entity = c(minecraftserver, icommandlistener, astring[astring.length - 1]); - if (entity.world != ((Entity) object).world) { - throw new CommandException("commands.tp.notSameDimension", new Object[0]); @@ -28,7 +28,7 @@ entity.stopRiding(); - ((EntityPlayer) entity).playerConnection.a(commandabstract_commandnumber.b(), commandabstract_commandnumber1.b(), commandabstract_commandnumber2.b(), f, f1, enumset); + ((EntityPlayer) entity).playerConnection.a(commandabstract_commandnumber.b(), commandabstract_commandnumber1.b(), commandabstract_commandnumber2.b(), f, f1, enumset, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND); // CraftBukkit - entity.h(f); + entity.setHeadRotation(f); } else { float f2 = (float) MathHelper.g(commandabstract_commandnumber3.a()); @@ -126,10 +120,17 @@ -- cgit v1.2.3