minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-16 11:37:30 +02:00
Code Issues Releases Wiki Activity

Catch TeleportClause.COMMAND in the teleport listener.

Browse Source 
Changed Teleport methods to pass a TeleportClause param
This commit is contained in:
ementalo
2011-12-07 01:12:36 +00:00
parent 854fc05c5b
commit 10597cec2f
19 changed files with 69 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
View File

@@ -7,6 +7,7 @@ import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import static com.earth2me.essentials.I18n._;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
public class Commandspawn extends EssentialsCommand
@@ -24,7 +25,7 @@ public class Commandspawn extends EssentialsCommand
if (args.length > 0 && user.isAuthorized("essentials.spawn.others"))
{
final User otherUser = getPlayer(server, args, 0);
otherUser.getTeleport().respawn(charge);
otherUser.getTeleport().respawn(charge, TeleportCause.COMMAND);
if (!otherUser.equals(user))
{
otherUser.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
@@ -33,7 +34,7 @@ public class Commandspawn extends EssentialsCommand
}
else
{
user.getTeleport().respawn(charge);
user.getTeleport().respawn(charge, TeleportCause.COMMAND);
}
}
@@ -45,7 +46,7 @@ public class Commandspawn extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
final User user = getPlayer(server, args, 0);
user.getTeleport().respawn(null);
user.getTeleport().respawn(null, TeleportCause.COMMAND);
user.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
sender.sendMessage(_("teleporting"));
}

3
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
View File

@@ -9,6 +9,7 @@ import org.bukkit.Location;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
public class EssentialsSpawnPlayerListener extends PlayerListener
@@ -84,7 +85,7 @@ public class EssentialsSpawnPlayerListener extends PlayerListener
{
try
{
user.getTeleport().now(spawns.getSpawn(ess.getSettings().getNewbieSpawn()), false);
user.getTeleport().now(spawns.getSpawn(ess.getSettings().getNewbieSpawn()), false, TeleportCause.PLUGIN);
}
catch (Exception ex)
{