JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update disabled checks to match anticheat updates

Browse Source
This commit is contained in:
AlexTheCoder 2018-03-04 05:34:15 -05:00
parent 79b6839736
commit 34428f7b5f
8 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -43,11 +43,14 @@ import org.bukkit.event.hanging.HangingPlaceEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.world.WorldLoadEvent;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scoreboard.NameTagVisibility;
import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.scoreboard.Team;
import org.bukkit.util.Vector;
import com.mineplex.anticheat.MineplexAnticheat;
import com.mineplex.anticheat.checks.move.Glide;
import com.mojang.authlib.GameProfile;
import mineplex.core.Managers;
@ -290,6 +293,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed
public boolean StrictAntiHack = false;
public boolean AnticheatDisabled = false;
public boolean GlideCheckEnabled = true;
public boolean DisableKillCommand = true;
@ -790,15 +794,19 @@ public abstract class Game extends ListenerComponent implements Lifetimed
_gameState = state;
_gameStateTime = System.currentTimeMillis();
if (this._gameState == Game.GameState.Prepare)
if (_gameState == Game.GameState.Prepare)
{
// Speed Builders, Master Builders, Draw My Thing, Castle Siege
if (!this.AnticheatDisabled)
if (!AnticheatDisabled)
{
Managers.get(AntiHack.class).enableAnticheat();
if (!GlideCheckEnabled)
{
JavaPlugin.getPlugin(MineplexAnticheat.class).getCheckManager().disableCheck(Glide.class);
}
}
}
else if (this._gameState == Game.GameState.End && !this.AnticheatDisabled)
else if (_gameState == Game.GameState.End && !this.AnticheatDisabled)
{
Managers.get(AntiHack.class).disableAnticheat();
}

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java
View File

@ -91,6 +91,7 @@ public class Dragons extends SoloGame
.register(this);
// Disable specific GWEN checks for this game
this.GlideCheckEnabled = false;
AntiHack antiHack = Managers.get(AntiHack.class);
antiHack.addIgnoredCheck(Speed.class);
antiHack.addIgnoredCheck(Glide.class);

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/Moba.java
View File

@ -179,6 +179,7 @@ public class Moba extends TeamGame
.register(this);
// Disable specific GWEN checks for this game
GlideCheckEnabled = false;
AntiHack antiHack = Managers.get(AntiHack.class);
antiHack.addIgnoredCheck(Speed.class);
antiHack.addIgnoredCheck(Glide.class);

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java
View File

@ -94,7 +94,8 @@ public class Runner extends SoloGame implements IThrown
.setGiveCompassToSpecs(true)
.setGiveCompassToAlive(false)
.register(this);
this.GlideCheckEnabled = false;
AntiHack antiHack = Managers.get(AntiHack.class);
antiHack.addIgnoredCheck(Speed.class);
antiHack.addIgnoredCheck(Glide.class);

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java
View File

@ -206,6 +206,7 @@ public abstract class Skyfall extends Game
registerModule(new VersionModule(MinecraftVersion.Version1_9));
// Disable specific GWEN checks for this game
GlideCheckEnabled = false;
AntiHack antiHack = Managers.get(AntiHack.class);
antiHack.addIgnoredCheck(Speed.class);
antiHack.addIgnoredCheck(Glide.class);

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
View File

@ -156,6 +156,7 @@ public abstract class SuperSmash extends Game
ReplaceTeamsWithKits = true;
AllowParticles = false;
PlayerGameMode = GameMode.ADVENTURE;
GlideCheckEnabled = false;
manager.GetExplosion().SetRegenerate(true);
manager.GetExplosion().setRegenerateTime(TimeUnit.SECONDS.toMillis(30));

22
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmashDominate.java
View File

@ -6,9 +6,9 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockFadeEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.event.player.PlayerInteractEvent;
@ -20,9 +20,23 @@ import nautilus.game.arcade.ArcadeFormat;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.game.games.common.Domination;
import nautilus.game.arcade.game.games.smash.kits.*;
import nautilus.game.arcade.game.games.smash.kits.KitBlaze;
import nautilus.game.arcade.game.games.smash.kits.KitChicken;
import nautilus.game.arcade.game.games.smash.kits.KitCreeper;
import nautilus.game.arcade.game.games.smash.kits.KitEnderman;
import nautilus.game.arcade.game.games.smash.kits.KitGolem;
import nautilus.game.arcade.game.games.smash.kits.KitMagmaCube;
import nautilus.game.arcade.game.games.smash.kits.KitPig;
import nautilus.game.arcade.game.games.smash.kits.KitSkeletalHorse;
import nautilus.game.arcade.game.games.smash.kits.KitSkeleton;
import nautilus.game.arcade.game.games.smash.kits.KitSkySquid;
import nautilus.game.arcade.game.games.smash.kits.KitSlime;
import nautilus.game.arcade.game.games.smash.kits.KitSnowman;
import nautilus.game.arcade.game.games.smash.kits.KitSpider;
import nautilus.game.arcade.game.games.smash.kits.KitWitch;
import nautilus.game.arcade.game.games.smash.kits.KitWitherSkeleton;
import nautilus.game.arcade.game.games.smash.kits.KitWolf;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.managers.chat.ChatStatData;
@ -68,6 +82,8 @@ public class SuperSmashDominate extends Domination
BlankLine,
new ChatStatData("kit", "Kit", true)
);
GlideCheckEnabled = false;
}
@EventHandler(priority = EventPriority.LOWEST)

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
View File

@ -25,6 +25,10 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import com.mineplex.anticheat.MineplexAnticheat;
import com.mineplex.anticheat.checks.move.Glide;
import mineplex.core.Managers;
import mineplex.core.account.permissions.Permission;
@ -187,6 +191,7 @@ public class GameHostManager implements Listener
// Disable all checks in event servers
Stream.concat(AntiHack.ACTIONS.keySet().stream(), AntiHack.CHECKS.keySet().stream()).distinct().forEach(_antiHack::addIgnoredCheck);
JavaPlugin.getPlugin(MineplexAnticheat.class).getCheckManager().disableCheck(Glide.class);
}
@EventHandler