diff options
| author | md_5 <git@md-5.net> | 2017-06-04 08:39:36 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-06-04 08:39:36 +1000 |
| commit | 10daedccdd9988b0d3744988aa73b9a1a9c5b95b (patch) | |
| tree | cd404d8a9d659f49be82b00fb915b21f59bfe31b | |
| parent | 9a032b246ba596a47c7b9f3c91d4260d84157ce8 (diff) | |
| download | craftbukkit-10daedccdd9988b0d3744988aa73b9a1a9c5b95b.tar craftbukkit-10daedccdd9988b0d3744988aa73b9a1a9c5b95b.tar.gz craftbukkit-10daedccdd9988b0d3744988aa73b9a1a9c5b95b.tar.lz craftbukkit-10daedccdd9988b0d3744988aa73b9a1a9c5b95b.tar.xz craftbukkit-10daedccdd9988b0d3744988aa73b9a1a9c5b95b.zip | |
Add proper TeleportCause for /teleport
| -rw-r--r-- | nms-patches/CommandTeleport.patch | 23 | ||||
| -rw-r--r-- | nms-patches/CommandTp.patch | 9 |
2 files changed, 24 insertions, 8 deletions
diff --git a/nms-patches/CommandTeleport.patch b/nms-patches/CommandTeleport.patch new file mode 100644 index 00000000..003cc6c1 --- /dev/null +++ b/nms-patches/CommandTeleport.patch @@ -0,0 +1,23 @@ +--- a/net/minecraft/server/CommandTeleport.java ++++ b/net/minecraft/server/CommandTeleport.java +@@ -69,7 +69,7 @@ + } + + entity.stopRiding(); +- ((EntityPlayer) entity).playerConnection.a(commandabstract_commandnumber.a(), commandabstract_commandnumber1.a(), commandabstract_commandnumber2.a(), f, f1, enumset); ++ ((EntityPlayer) entity).playerConnection.a(commandabstract_commandnumber.a(), commandabstract_commandnumber1.a(), commandabstract_commandnumber2.a(), f, f1, enumset, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND); // CraftBukkit + entity.setHeadRotation(f); + } else { + float f2 = (float) MathHelper.g(commandabstract_commandnumber3.a()); +@@ -94,4 +94,11 @@ + public boolean isListStart(String[] astring, int i) { + return i == 0; + } ++ ++ // CraftBukkit start - fix decompile error ++ @Override ++ public int compareTo(ICommand o) { ++ return a((ICommand) o); ++ } ++ // CraftBukkit end + } diff --git a/nms-patches/CommandTp.patch b/nms-patches/CommandTp.patch index 73ec32da..603af708 100644 --- a/nms-patches/CommandTp.patch +++ b/nms-patches/CommandTp.patch @@ -31,14 +31,7 @@ entity.setHeadRotation(f); } else { float f2 = (float) MathHelper.g(commandabstract_commandnumber3.a()); -@@ -126,10 +120,17 @@ - } - - public List<String> tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) { -- return astring.length != 1 && astring.length != 2 ? Collections.emptyList() : a(astring, minecraftserver.getPlayers()); -+ return astring.length != 1 && astring.length != 2 ? Collections.<String>emptyList() : a(astring, minecraftserver.getPlayers()); // CraftBukkit - decompile error - } - +@@ -132,4 +126,11 @@ public boolean isListStart(String[] astring, int i) { return i == 0; } |