TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-12-28 11:04:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix regression with teleportation commands where command cost gets charged twice (#3601)

Browse source
This commit is contained in:
triagonal 2020-08-17 07:40:58 +10:00 committed by GitHub
parent bc52ca856e
commit 73d2457fea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Essentials/src/com/earth2me/essentials/commands/Commandhome.java
View file

@ -64,7 +64,7 @@ public class Commandhome extends EssentialsCommand {
showError(user.getBase(), new Exception(tl("bedMissing")), commandLabel);
}
});
return;
throw new NoChargeException();
}
goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), charge, getNewExceptionFuture(user.getSource(), commandLabel));
} catch (NotEnoughArgumentsException e) {
@ -108,6 +108,7 @@ public class Commandhome extends EssentialsCommand {
}
PaperLib.getBedSpawnLocationAsync(player.getBase(), true).thenAccept(message::complete);
}
throw new NoChargeException();
}
private String getHomeLimit(final User player) {

2
Essentials/src/com/earth2me/essentials/commands/Commandjump.java
View file

@ -47,6 +47,8 @@ public class Commandjump extends EssentialsCommand {
final Trade charge = new Trade(this.getName(), ess);
charge.isAffordableFor(user);
user.getAsyncTeleport().teleport(loc, charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel));
throw new NoChargeException();
}
@Override

2
Essentials/src/com/earth2me/essentials/commands/Commandtp.java
View file

@ -44,7 +44,7 @@ public class Commandtp extends EssentialsCommand {
final Trade charge = new Trade(this.getName(), ess);
charge.isAffordableFor(user);
user.getAsyncTeleport().teleport(player.getBase(), charge, TeleportCause.COMMAND, future);
break;
throw new NoChargeException();
case 3:
if (!user.isAuthorized("essentials.tp.position")) {
throw new Exception(tl("noPerm", "essentials.tp.position"));

1
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
View file

@ -72,6 +72,7 @@ public class Commandtpaccept extends EssentialsCommand {
teleport.teleport(user.getBase(), charge, TeleportCause.COMMAND, future);
}
user.requestTeleport(null, false);
throw new NoChargeException();
}
}

1
Essentials/src/com/earth2me/essentials/commands/Commandtphere.java
View file

@ -26,6 +26,7 @@ public class Commandtphere extends EssentialsCommand {
throw new Exception(tl("noPerm", "essentials.worlds." + user.getWorld().getName()));
}
user.getAsyncTeleport().teleportPlayer(player, user.getBase(), new Trade(this.getName(), ess), TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel));
throw new NoChargeException();
}
@Override

2
Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
View file

@ -56,6 +56,8 @@ public class Commandtppos extends EssentialsCommand {
charge.isAffordableFor(user);
user.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
user.getAsyncTeleport().teleport(loc, charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel));
throw new NoChargeException();
}
@Override

1
Essentials/src/com/earth2me/essentials/commands/Commandtpr.java
View file

@ -39,6 +39,7 @@ public class Commandtpr extends EssentialsCommand {
}
});
});
throw new NoChargeException();
}
@Override

4
Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
View file

@ -42,9 +42,10 @@ public class Commandwarp extends EssentialsCommand {
if (args.length == 2 && (user.isAuthorized("essentials.warp.otherplayers") || user.isAuthorized("essentials.warp.others"))) {
otherUser = getPlayer(server, user, args, 1);
warpUser(user, otherUser, args[0], commandLabel);
return;
throw new NoChargeException();
}
warpUser(user, user, args[0], commandLabel);
throw new NoChargeException();
}
}
@ -56,6 +57,7 @@ public class Commandwarp extends EssentialsCommand {
}
User otherUser = getPlayer(server, args, 1, true, false);
otherUser.getAsyncTeleport().warp(otherUser, args[0], null, TeleportCause.COMMAND, getNewExceptionFuture(sender, commandLabel));
throw new NoChargeException();
}
//TODO: Use one of the new text classes, like /help ?

2
Essentials/src/com/earth2me/essentials/commands/Commandworld.java
View file

@ -67,6 +67,8 @@ public class Commandworld extends EssentialsCommand {
final Trade charge = new Trade(this.getName(), ess);
charge.isAffordableFor(user);
user.getAsyncTeleport().teleport(target, charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel));
throw new NoChargeException();
}
@Override

3
EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
View file

@ -5,6 +5,7 @@ import com.earth2me.essentials.Console;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import com.earth2me.essentials.commands.EssentialsCommand;
import com.earth2me.essentials.commands.NoChargeException;
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import org.bukkit.Location;
import org.bukkit.Server;
@ -40,6 +41,8 @@ public class Commandspawn extends EssentialsCommand {
} else {
respawn(user.getSource(), user, user, charge, commandLabel, new CompletableFuture<>());
}
throw new NoChargeException();
}
@Override