Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-10-06 02:17:25 +02:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Adapt teleport handling to cancelled events better.

Browse Source 
Also will invalidate currently processed moving events.
This commit is contained in:
asofold 2013-01-14 01:49:27 +01:00
parent 0e9826cb14
commit fed73d519b
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -1,7 +1,9 @@
package fr.neatmonster.nocheatplus.checks.moving;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
@ -133,10 +135,15 @@ public class MovingListener extends CheckListener{
/**
* Unused instances.<br>
* TODO: Not sure this is needed by contract, might be better due to cascading events in case of actions.
* Might be better due to cascading events in case of actions or plugins doing strange things.
*/
private final List<MoveInfo> parkedInfo = new ArrayList<MoveInfo>(10);
/**
* Store events by player name, in order to invalidate moving processing on higher priority level in case of teleports.
*/
private final Map<String, PlayerMoveEvent> processingEvents = new HashMap<String, PlayerMoveEvent>();
public MovingListener() {
super(CheckType.MOVING);
}
@ -343,6 +350,9 @@ public class MovingListener extends CheckListener{
*/
final Player player = event.getPlayer();
// Store the event for monitor level checks.
processingEvents.put(player.getName(), event);
// Ignore players in vehicles.
if (player.isInsideVehicle()) return;
@ -571,6 +581,12 @@ public class MovingListener extends CheckListener{
// TODO: revise: cancelled events.
final long now = System.currentTimeMillis();
final Player player = event.getPlayer();
if (processingEvents.remove(player.getName()) == null){
// This means moving data has been reset by a teleport.
return;
}
if (player.isDead() || player.isSleeping()) return;
// Feed combined check.
@ -706,18 +722,26 @@ public class MovingListener extends CheckListener{
data.onSetBack(teleported);
} else {
// Only if it wasn't NoCheatPlus, drop data from more packets check.
// TODO: check if to do with cancelled teleports !
data.clearMorePacketsData();
data.clearFlyData();
ref = event.isCancelled() ? event.getFrom() : to;
data.resetPositions(ref);
if (!event.isCancelled()){
// Normal teleport.
ref = to;
data.clearMorePacketsData();
data.clearFlyData();
data.resetPositions(to);
data.setSetBack(to);
}
else{
// Cancelled, not a set back, ignore it, basically.
// Better reset teleported (compatibility). Might have drawbacks.
data.resetTeleported();
return;
}
}
// TODO: NoFall might be necessary to be checked here ?
data.resetTeleported();
// Reset yawrate (experimental: might help preventing cascading improbable with rubberbanding).
Combined.resetYawRate(player, ref.getYaw(), System.currentTimeMillis(), true);
// Reset stuff.
Combined.resetYawRate(player, ref.getYaw(), System.currentTimeMillis(), true);
data.resetTeleported();
processingEvents.remove(player.getName());
}
/**