Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix undoing of cancelled set-back teleports.

This commit is contained in:
asofold 2017-05-12 21:14:26 +02:00
parent 9478daaa02
commit 076bf52e24
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -1724,7 +1724,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
final Player player = event.getPlayer();
final MovingData data = MovingData.getData(player);
// Revert cancel on set back (only precise match).
if (data.isTeleported(event.getTo())) {
if (data.hasTeleported()) {
// Teleport by NCP.
// TODO: What if not scheduled.
undoCancelledSetBack(player, event, data);
@ -1733,12 +1733,20 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
private final void undoCancelledSetBack(final Player player, final PlayerTeleportEvent event,
final MovingData data) {
final Location teleported = data.getTeleported();
// Prevent cheaters getting rid of flying data (morepackets, other).
// TODO: even more strict enforcing ?
event.setCancelled(false); // TODO: Does this make sense? Have it configurable rather?
event.setTo(teleported); // ?
event.setFrom(teleported);
if (!data.isTeleported(event.getTo())) {
final Location teleported = data.getTeleported();
event.setTo(teleported);
/*
* Setting from ... not sure this is relevant. Idea was to avoid
* subtleties with other plugins, but it probably can't be
* estimated, if this means more or less 'subtleties' in the end
* (amortized).
*/
event.setFrom(teleported);
}
if (data.debug) {
NCPAPIProvider.getNoCheatPlusAPI().getLogManager().warning(
Streams.TRACE_FILE, player.getName() + " TP " + event.getCause()