Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-27 14:13:11 +02:00
Code Issues Projects Releases Wiki Activity

Set back preparation + confirmation: slight cleanup

Browse Source 
* MovingListener.prepareSetBack makes more sense than the previous
ambiguous naming.
* On confirming a set back, don't update the setBack field, only set if
null.

The aim is to have a more consistent handling and naming for set back
stages.
This commit is contained in:
asofold 2017-04-07 12:49:23 +02:00
parent d88b36d4bc
commit ef1d811a4b
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingData.java
View File

@ -412,9 +412,10 @@ public class MovingData extends ACheckData {
}
/**
* Teleport event: Mildly reset the flying data without losing any important
* information. The given setBack location is set internally, past move set
* to it.
* On confirming a set back (teleport monitor / move start point): Mildly
* reset the flying data without losing any important information. Past move
* is adjusted to the given setBack, internal setBack is only updated, if
* none is set.
*
* @param setBack
*/
@ -444,8 +445,10 @@ public class MovingData extends ACheckData {
// Reset to setBack.
resetPlayerPositions(setBack);
adjustMediumProperties(setBack);
// TODO: Only setSetBack if no set back location is there? Policies?
setSetBack(setBack); // Problematic with multiple set back locations stored (currently the safe-medium one is preferred, but later...)
// Only setSetBack if no set back location is there.
if (setBack == null) {
setSetBack(setBack);
}
// vehicleSetBacks.resetAllLazily(setBack); // Not good: Overrides older set back locations.
}

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

@ -465,7 +465,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
if (data.debug) {
debug(player, "Early return on PlayerMoveEvent, set back to: " + newTo);
}
onSetBack(player, event, newTo, data, cc);
prepareSetBack(player, event, newTo, data, cc);
}
data.joinOrRespawn = false;
return;
@ -951,7 +951,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
}
}
// Set back handling.
onSetBack(player, event, newTo, data, cc);
prepareSetBack(player, event, newTo, data, cc);
return true;
}
}
@ -1341,8 +1341,9 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
}
/**
* Called during PlayerMoveEvent for adjusting to a to-be-scheduled set
* back.
* Called during PlayerMoveEvent for adjusting to a to-be-done/scheduled set
* back. <br>
* NOTE: Meaning differs from data.onSetBack (to be cleaned up).
*
* @param player
* @param event
@ -1352,7 +1353,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
* @param data
* @param cc
*/
private void onSetBack(final Player player, final PlayerMoveEvent event, final Location newTo, final MovingData data, final MovingConfig cc) {
private void prepareSetBack(final Player player, final PlayerMoveEvent event, final Location newTo, final MovingData data, final MovingConfig cc) {
// Illegal Yaw/Pitch.
if (LocUtil.needsYawCorrection(newTo.getYaw())) {
newTo.setYaw(LocUtil.correctYaw(newTo.getYaw()));