Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-01-30 19:31:28 +01:00
Code Issues Projects Releases Wiki Activity

Reset to the players location on join. Adaptions to set-back use.

Browse Source
This commit is contained in:
asofold 2013-01-09 19:20:43 +01:00
parent 6cc3791439
commit 5c8e76ecba
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,15 +240,13 @@ public class MovingListener extends CheckListener{
final MovingConfig cc = MovingConfig.getConfig(player); final MovingConfig cc = MovingConfig.getConfig(player);
Location target = null; Location target = null;
final boolean sfCheck = shouldCheckSurvivalFly(player, data, cc); final boolean sfCheck = shouldCheckSurvivalFly(player, data, cc);
if (sfCheck) target = data.setBack; if (sfCheck) target = data.getSetBack(loc);
if (target == null){ if (target == null){
// TODO: Add something to guess the best set back location (possibly data.guessSetBack(Location)). // TODO: Add something to guess the best set back location (possibly data.guessSetBack(Location)).
target = loc; target = loc;
} }
if (target != null){ if (target != null){
// Actually this should not possibly be null, this is a block for "future" purpose, feel free to criticize it. // Actually this should not possibly be null, this is a block for "future" purpose, feel free to criticize it.
target.setPitch(loc.getPitch());
target.setYaw(loc.getYaw());
if (sfCheck && noFall.isEnabled(player)){ if (sfCheck && noFall.isEnabled(player)){
// Check if to deal damage. // Check if to deal damage.
double y = loc.getY(); double y = loc.getY();
@ -256,7 +254,7 @@ public class MovingListener extends CheckListener{
noFall.checkDamage(player, data, y); noFall.checkDamage(player, data, y);
} }
// Teleport. // Teleport.
data.teleported = new Location(target.getWorld(), target.getX(), target.getY(), target.getZ(), target.getYaw(), target.getPitch()); data.teleported = target; // Should be enough. | new Location(target.getWorld(), target.getX(), target.getY(), target.getZ(), target.getYaw(), target.getPitch());
player.teleport(target, TeleportCause.PLUGIN);// TODO: schedule / other measures ? player.teleport(target, TeleportCause.PLUGIN);// TODO: schedule / other measures ?
} }
} }
@ -867,12 +865,13 @@ public class MovingListener extends CheckListener{
final MovingData data = MovingData.getData(player); final MovingData data = MovingData.getData(player);
// TODO: on existing set back: detect world changes and loss of world on join (+ set up some paradigm). // TODO: on existing set back: detect world changes and loss of world on join (+ set up some paradigm).
data.clearMorePacketsData(); data.clearMorePacketsData();
final Location loc = player.getLocation();
if (data.setBack == null){ if (data.setBack == null){
data.setBack = player.getLocation(); data.setBack = loc;
} }
if (data.fromX == Double.MAX_VALUE && data.toX == Double.MAX_VALUE){ if (data.fromX == Double.MAX_VALUE && data.toX == Double.MAX_VALUE){
// TODO: re-think: more fine grained reset? // TODO: re-think: more fine grained reset?
data.resetPositions(data.setBack); data.resetPositions(loc);
} }
} }