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

Bleeding: Adjust reset-conditions for set-back location and similar.

Browse Source
This commit is contained in:
asofold 2012-11-11 17:11:04 +01:00
parent cf99770902
commit c1bb11a725
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -209,9 +209,10 @@ public class MovingListener implements Listener {
* |___/ * |___/
*/ */
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final MovingData data = MovingData.getData(player);
if (!player.hasPermission(Permissions.MOVING_CREATIVEFLY) && survivalFly.isEnabled(player)) { final MovingConfig cc = MovingConfig.getConfig(player);
final MovingData data = MovingData.getData(player);
if (shouldCheckSurvivalFly(player, data, cc)) {
// Check if the player has to be reset. // Check if the player has to be reset.
final Location target = survivalFly.checkBed(player, data); final Location target = survivalFly.checkBed(player, data);
// To cancel the event, we teleport the player. // To cancel the event, we teleport the player.
@ -248,10 +249,13 @@ public class MovingListener implements Listener {
* |___/ |___/ * |___/ |___/
*/ */
// Maybe this helps with people teleporting through Multiverse portals having problems? // Maybe this helps with people teleporting through Multiverse portals having problems?
final MovingData data = MovingData.getData(event.getPlayer()); final Player player = event.getPlayer();
final MovingData data = MovingData.getData(player);
data.teleported = null; data.teleported = null;
data.clearFlyData(); data.clearFlyData();
data.clearMorePacketsData(); data.clearMorePacketsData();
// TODO: Might omit this if neither check is activated.
data.setBack = player.getLocation();
} }
/** /**
@ -605,9 +609,7 @@ public class MovingListener implements Listener {
final MovingData data = MovingData.getData(player); final MovingData data = MovingData.getData(player);
data.clearFlyData(); data.clearFlyData();
data.clearMorePacketsData(); data.clearMorePacketsData();
if (survivalFly.isEnabled(player)) { data.setBack = event.getRespawnLocation();
data.setBack = event.getRespawnLocation();
}
} }
/** /**
@ -783,11 +785,11 @@ public class MovingListener implements Listener {
if (!(entity instanceof Player)) return; if (!(entity instanceof Player)) return;
final Player player = (Player) entity; final Player player = (Player) entity;
final MovingData data = MovingData.getData(player); final MovingData data = MovingData.getData(player);
if (event.isCancelled() || !survivalFly.isEnabled(player) || !noFall.isEnabled(player)){ final MovingConfig cc = MovingConfig.getConfig(player);
if (event.isCancelled() || !shouldCheckSurvivalFly(player, data, cc) || !noFall.isEnabled(player)){
data.clearNoFallData(); data.clearNoFallData();
return; return;
} }
final MovingConfig cc = MovingConfig.getConfig(player);
final float fallDistance = player.getFallDistance(); final float fallDistance = player.getFallDistance();
final int damage = event.getDamage(); final int damage = event.getDamage();
final float yDiff = (float) (data.noFallMaxY - player.getLocation().getY()); final float yDiff = (float) (data.noFallMaxY - player.getLocation().getY());
@ -806,16 +808,14 @@ public class MovingListener implements Listener {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoin(final PlayerJoinEvent event) { public void onPlayerJoin(final PlayerJoinEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (survivalFly.isEnabled(player)){ 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). if (data.setBack == null){
if (data.setBack == null){ data.setBack = player.getLocation();
data.setBack = player.getLocation(); }
} 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(data.setBack);
}
} }
} }
@ -839,4 +839,20 @@ public class MovingListener implements Listener {
return 1D + mcPlayer.getEffect(MobEffectList.JUMP).getAmplifier(); return 1D + mcPlayer.getEffect(MobEffectList.JUMP).getAmplifier();
} else return 0D; } else return 0D;
} }
/**
* Heavier check, but convenient for seldom events (not for use in the player-move check).
* @param player
* @param data
* @param cc
* @return
*/
public final boolean shouldCheckSurvivalFly(final Player player, final MovingData data, final MovingConfig cc){
if (player.hasPermission(Permissions.MOVING_CREATIVEFLY)) return false;
else if (!survivalFly.isEnabled(player)) return false;
else if ((cc.ignoreCreative || player.getGameMode() != GameMode.CREATIVE) && (cc.ignoreAllowFlight || !player.getAllowFlight())){
return true;
}
else return false;
}
} }