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

Quick attempt to make spectator mode almost work (not fly speed yet).

Browse Source
This commit is contained in:
asofold 2015-01-10 04:07:07 +01:00
parent 0e3295be29
commit 02a95f6cab
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ import fr.neatmonster.nocheatplus.checks.combined.Combined;
import fr.neatmonster.nocheatplus.checks.combined.CombinedConfig;
import fr.neatmonster.nocheatplus.checks.combined.CombinedData;
import fr.neatmonster.nocheatplus.compat.BridgeHealth;
import fr.neatmonster.nocheatplus.compat.BridgeMisc;
import fr.neatmonster.nocheatplus.components.IData;
import fr.neatmonster.nocheatplus.components.IHaveCheckType;
import fr.neatmonster.nocheatplus.components.INeedConfig;
@ -155,8 +156,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
* @param event
* the event
*/
@EventHandler(
ignoreCancelled = true, priority = EventPriority.MONITOR)
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
public void onBlockPlace(final BlockPlaceEvent event) {
final Player player = event.getPlayer();
@ -165,15 +165,21 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
return;
final org.bukkit.block.Block block = event.getBlock();
if (block == null) return;
if (block == null) {
return;
}
final int blockY = block.getY();
final Material mat = block.getType();
final MovingData data = MovingData.getData(player);
if (!creativeFly.isEnabled(player) && !survivalFly.isEnabled(player)) return;
if (!MovingUtil.shouldCheckSurvivalFly(player, data, MovingConfig.getConfig(player))) {
return;
}
if (!data.hasSetBack() || blockY + 1D < data.getSetBackY()) return;
if (!data.hasSetBack() || blockY + 1D < data.getSetBackY()) {
return;
}
final Location loc = player.getLocation(useLoc);
if (Math.abs(loc.getX() - 0.5 - block.getX()) <= 1D
@ -431,6 +437,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
data.timeSprinting = time;
}
else if (time < data.timeSprinting) {
// TODO: Ensure that its not reset within latency/cooldown.
data.timeSprinting = 0;
}
// else: keep sprinting time.
@ -467,7 +474,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// Check passable first to prevent set-back override.
// TODO: Redesign to set set-backs later (queue + invalidate).
boolean mightSkipNoFall = false; // If to skip nofall check (mainly on violation of other checks).
if (newTo == null && cc.passableCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_PASSABLE) && !player.hasPermission(Permissions.MOVING_PASSABLE)) {
if (newTo == null && cc.passableCheck && player.getGameMode() != BridgeMisc.GAME_MODE_SPECTATOR && !NCPExemptionManager.isExempted(player, CheckType.MOVING_PASSABLE) && !player.hasPermission(Permissions.MOVING_PASSABLE)) {
// Passable is checked first to get the original set-back locations from the other checks, if needed.
newTo = passable.check(player, loc, pFrom, pTo, data, cc);
if (newTo != null) {

9
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingUtil.java
View File

@ -11,6 +11,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
import fr.neatmonster.nocheatplus.NCPAPIProvider;
import fr.neatmonster.nocheatplus.checks.CheckType;
import fr.neatmonster.nocheatplus.compat.BridgeMisc;
import fr.neatmonster.nocheatplus.hooks.NCPExemptionManager;
import fr.neatmonster.nocheatplus.logging.StaticLog;
import fr.neatmonster.nocheatplus.permissions.Permissions;
@ -39,8 +40,12 @@ public class MovingUtil {
* @return
*/
public static final boolean shouldCheckSurvivalFly(final Player player, final MovingData data, final MovingConfig cc) {
return cc.survivalFlyCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_SURVIVALFLY) && !player.hasPermission(Permissions.MOVING_SURVIVALFLY) &&
(cc.ignoreCreative || player.getGameMode() != GameMode.CREATIVE) && !player.isFlying() && (cc.ignoreAllowFlight || !player.getAllowFlight());
final GameMode gameMode = player.getGameMode();
return cc.survivalFlyCheck && gameMode != BridgeMisc.GAME_MODE_SPECTATOR &&
!NCPExemptionManager.isExempted(player, CheckType.MOVING_SURVIVALFLY)
&& !player.hasPermission(Permissions.MOVING_SURVIVALFLY) &&
(cc.ignoreCreative || gameMode != GameMode.CREATIVE) && !player.isFlying()
&& (cc.ignoreAllowFlight || !player.getAllowFlight());
}
/**

10
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/BridgeMisc.java
View File

@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
@ -16,6 +17,15 @@ import org.bukkit.entity.Projectile;
*/
public class BridgeMisc {
private static GameMode getSpectatorGameMode() {
try {
return GameMode.SPECTATOR;
} catch (Throwable t) {}
return null;
}
public static final GameMode GAME_MODE_SPECTATOR = getSpectatorGameMode();
/**
* Return a shooter of a projectile if we get an entity, null otherwise.
*/