geforkt von Mirrors/Paper
46 Zeilen
2.3 KiB
Diff
46 Zeilen
2.3 KiB
Diff
--- a/net/minecraft/server/CommandTp.java
|
|
+++ b/net/minecraft/server/CommandTp.java
|
|
@@ -53,17 +53,11 @@
|
|
} else {
|
|
Entity entity = c(minecraftserver, icommandlistener, astring[astring.length - 1]);
|
|
|
|
- if (entity.world != ((Entity) object).world) {
|
|
- throw new CommandException("commands.tp.notSameDimension", new Object[0]);
|
|
- } else {
|
|
- ((Entity) object).stopRiding();
|
|
- if (object instanceof EntityPlayer) {
|
|
- ((EntityPlayer) object).playerConnection.a(entity.locX, entity.locY, entity.locZ, entity.yaw, entity.pitch);
|
|
- } else {
|
|
- ((Entity) object).setPositionRotation(entity.locX, entity.locY, entity.locZ, entity.yaw, entity.pitch);
|
|
- }
|
|
-
|
|
+ // CraftBukkit Start
|
|
+ // Use Bukkit teleport method in all cases. It has cross dimensional handling, events
|
|
+ if (((Entity) object).getBukkitEntity().teleport(entity.getBukkitEntity(), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND)) {
|
|
a(icommandlistener, (ICommand) this, "commands.tp.success", new Object[] { ((Entity) object).getName(), entity.getName()});
|
|
+ // CraftBukkit End
|
|
}
|
|
}
|
|
}
|
|
@@ -107,7 +101,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.setHeadRotation(f);
|
|
} else {
|
|
float f2 = (float) MathHelper.g(commandabstract_commandnumber3.a());
|
|
@@ -132,4 +126,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
|
|
}
|