mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-07-11 16:24:23 +00:00
Adjusting /spawn to not trigger respawn event.
This commit is contained in:
parent
13a42d1937
commit
9410a25cce
2 changed files with 15 additions and 6 deletions
|
@ -1,6 +1,7 @@
|
||||||
package com.earth2me.essentials.commands;
|
package com.earth2me.essentials.commands;
|
||||||
|
|
||||||
import static com.earth2me.essentials.I18n._;
|
import static com.earth2me.essentials.I18n._;
|
||||||
|
import com.earth2me.essentials.Trade;
|
||||||
import com.earth2me.essentials.User;
|
import com.earth2me.essentials.User;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
@ -32,6 +33,7 @@ public class Commandpay extends EssentialsCommand
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
user.payUser(u, amount);
|
user.payUser(u, amount);
|
||||||
|
Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), u.getName(), new Trade(amount, ess), user.getLocation(), ess);
|
||||||
foundUser = true;
|
foundUser = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
package com.earth2me.essentials.spawn;
|
package com.earth2me.essentials.spawn;
|
||||||
|
|
||||||
|
import static com.earth2me.essentials.I18n._;
|
||||||
import com.earth2me.essentials.Trade;
|
import com.earth2me.essentials.Trade;
|
||||||
import com.earth2me.essentials.User;
|
import com.earth2me.essentials.User;
|
||||||
import com.earth2me.essentials.commands.EssentialsCommand;
|
import com.earth2me.essentials.commands.EssentialsCommand;
|
||||||
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
|
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
|
||||||
import static com.earth2me.essentials.I18n._;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
||||||
|
@ -25,7 +26,7 @@ public class Commandspawn extends EssentialsCommand
|
||||||
if (args.length > 0 && user.isAuthorized("essentials.spawn.others"))
|
if (args.length > 0 && user.isAuthorized("essentials.spawn.others"))
|
||||||
{
|
{
|
||||||
final User otherUser = getPlayer(server, args, 0);
|
final User otherUser = getPlayer(server, args, 0);
|
||||||
otherUser.getTeleport().respawn(charge, TeleportCause.COMMAND);
|
respawn(otherUser, null);
|
||||||
if (!otherUser.equals(user))
|
if (!otherUser.equals(user))
|
||||||
{
|
{
|
||||||
otherUser.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
|
otherUser.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
|
||||||
|
@ -34,7 +35,7 @@ public class Commandspawn extends EssentialsCommand
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
user.getTeleport().respawn(charge, TeleportCause.COMMAND);
|
respawn(user, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,8 +47,14 @@ public class Commandspawn extends EssentialsCommand
|
||||||
throw new NotEnoughArgumentsException();
|
throw new NotEnoughArgumentsException();
|
||||||
}
|
}
|
||||||
final User user = getPlayer(server, args, 0);
|
final User user = getPlayer(server, args, 0);
|
||||||
user.getTeleport().respawn(null, TeleportCause.COMMAND);
|
respawn(user, null);
|
||||||
user.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
|
user.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
|
||||||
sender.sendMessage(_("teleporting"));
|
sender.sendMessage(_("teleporting"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void respawn (final User user, final Trade charge) throws Exception {
|
||||||
|
final SpawnStorage spawns = (SpawnStorage)this.module;
|
||||||
|
final Location spawn = spawns.getSpawn(user.getGroup());
|
||||||
|
user.getTeleport().teleport(spawn, charge, TeleportCause.COMMAND);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue