mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
Add proper TeleportCause for /teleport
This commit is contained in:
parent
9a032b246b
commit
10daedccdd
23
nms-patches/CommandTeleport.patch
Normal file
23
nms-patches/CommandTeleport.patch
Normal file
@ -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
|
||||
}
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user