EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Party teleportation now requires the target player to confirm the teleport request before the teleportation takes place.

Browse Source
This commit is contained in:
TfT_02
2013-01-28 00:52:51 +01:00
parent 765199eba3
commit d744c6a46d
4 changed files with 116 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
View File

@ -31,6 +31,7 @@ public class PlayerProfile {
/* Party Stuff */
private Party party;
private Party invite;
private String ptpRequest;
private boolean ptpEnabled = true;
/* Toggles */
@ -1244,4 +1245,24 @@ public class PlayerProfile {
public void togglePtpUse() {
ptpEnabled = !ptpEnabled;
}
public void setPtpRequest(String ptpRequest) {
this.ptpRequest = ptpRequest;
}
public String getPtpRequest() {
return ptpRequest;
}
public boolean hasPtpRequest() {
if (ptpRequest != null) {
return true;
}
return false;
}
public void removePtpRequest() {
ptpRequest = null;
}
}

127
src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
View File

@ -40,7 +40,10 @@ public class PtpCommand implements CommandExecutor {
PlayerProfile profile = Users.getProfile(player);
if (args[0].equalsIgnoreCase("toggle")) {
return toggle(sender, args);
return togglePartyTeleportation(sender, args);
}
else if (args[0].equalsIgnoreCase("deny")) {
return denyTeleportRequest(sender, args);
}
if (profile.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * Misc.TIME_CONVERSION_FACTOR) > System.currentTimeMillis()) {
@ -48,54 +51,100 @@ public class PtpCommand implements CommandExecutor {
return true;
}
Player target = plugin.getServer().getPlayer(args[0]);
if (player.equals(target)) {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
return true;
}
if (target == null) {
player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
return true;
}
if (target.isDead()) {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
return true;
}
if (PartyManager.inSameParty(player, target)) {
if (Users.getProfile(target).getPtpEnabled()) {
McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, profile.getParty().getName());
plugin.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;
}
player.teleport(target);
player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", new Object[] { target.getName() }));
target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", new Object[] { player.getName() }));
profile.setRecentlyHurt(System.currentTimeMillis());
} else {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", new Object[] { target.getName() }));
}
if (args[0].equalsIgnoreCase("accept")) {
return acceptTeleportRequest(sender, args);
}
else {
player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { target.getName() }));
return true;
return sendTeleportRequest(sender, args);
}
return true;
default:
sender.sendMessage(usage);
return true;
}
}
private boolean toggle(CommandSender sender, String[] args) {
private boolean sendTeleportRequest(CommandSender sender, String[] args) {
Player player = (Player) sender;
Player target = plugin.getServer().getPlayer(args[0]);
if (player.equals(target)) {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
return true;
}
if (target == null) {
player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
return true;
}
if (target.isDead()) {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
return true;
}
if (PartyManager.inSameParty(player, target)) {
if (Users.getProfile(target).getPtpEnabled()) {
Users.getProfile(target).setPtpRequest(player.getName());
player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
target.sendMessage(LocaleLoader.getString("Commands.ptp.Request", new Object[] {player.getName()}));
return true;
}else {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", new Object[] { target.getName() }));
}
} else {
player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { target.getName() }));
}
return true;
}
private boolean acceptTeleportRequest(CommandSender sender, String[] args) {
Player player = (Player) sender;
PlayerProfile playerProfile = Users.getProfile(player);
if (playerProfile.hasPtpRequest()) {
Player target = plugin.getServer().getPlayer(playerProfile.getPtpRequest());
if (Users.getProfile(target).getPtpEnabled()) {
McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, playerProfile.getParty().getName());
plugin.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;
}
target.teleport(player);
target.sendMessage(LocaleLoader.getString("Party.Teleport.Player", new Object[] { player.getName() }));
player.sendMessage(LocaleLoader.getString("Party.Teleport.Target", new Object[] { target.getName() }));
playerProfile.setRecentlyHurt(System.currentTimeMillis());
} else {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", new Object[] { target.getName() }));
}
}
else {
player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
}
return true;
}
private boolean denyTeleportRequest(CommandSender sender, String[] args) {
Player player = (Player) sender;
PlayerProfile playerProfile = Users.getProfile(player);
if (playerProfile.hasPtpRequest()) {
Player target = plugin.getServer().getPlayer(playerProfile.getPtpRequest());
player.sendMessage(LocaleLoader.getString("Commands.ptp.Deny"));
target.sendMessage(LocaleLoader.getString("Commands.ptp.Denied", new Object[] { player.getName() }));
playerProfile.removePtpRequest();
}
else {
player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
}
return true;
}
private boolean togglePartyTeleportation(CommandSender sender, String[] args) {
Player player = (Player) sender;
PlayerProfile profile = Users.getProfile(player);