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

Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-05-04 12:52:14 -07:00
parent f623026dfc 3c2fc4c49b
commit 97e083c1e7
6 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
View File

@ -435,4 +435,9 @@ public class AntiHack extends MiniPlugin
_enabled = b; _enabled = b;
System.out.println("MAC Enabled: " + b); System.out.println("MAC Enabled: " + b);
} }
public boolean IsEnabled()
{
return _enabled;
}
} }

3
Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Fly.java
View File

@ -37,6 +37,9 @@ public class Fly extends MiniPlugin implements Detector
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void updateFlyhack(PlayerMoveEvent event) public void updateFlyhack(PlayerMoveEvent event)
{ {
if (!Host.IsEnabled())
return;
Player player = event.getPlayer(); Player player = event.getPlayer();
//100% Valid //100% Valid

6
Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Idle.java
View File

@ -32,6 +32,9 @@ public class Idle extends MiniPlugin implements Detector
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void updateFlyhack(PlayerMoveEvent event) public void updateFlyhack(PlayerMoveEvent event)
{ {
if (!Host.IsEnabled())
return;
Player player = event.getPlayer(); Player player = event.getPlayer();
_idleTime.put(player, System.currentTimeMillis()); _idleTime.put(player, System.currentTimeMillis());
@ -40,6 +43,9 @@ public class Idle extends MiniPlugin implements Detector
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void updateFreeCam(UpdateEvent event) public void updateFreeCam(UpdateEvent event)
{ {
if (!Host.IsEnabled())
return;
if (event.getType() != UpdateType.FAST) if (event.getType() != UpdateType.FAST)
return; return;

3
Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Speed.java
View File

@ -33,6 +33,9 @@ public class Speed extends MiniPlugin implements Detector
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void updateSpeedhack(PlayerMoveEvent event) public void updateSpeedhack(PlayerMoveEvent event)
{ {
if (!Host.IsEnabled())
return;
Player player = event.getPlayer(); Player player = event.getPlayer();
//100% Valid //100% Valid

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

@ -40,9 +40,12 @@ public class IdleManager implements Listener
if (event.getType() != UpdateType.FAST) if (event.getType() != UpdateType.FAST)
return; return;
if (Manager.GetGame() == null) if (Manager.IsTournamentServer())
return; return;
if (Manager.GetGame() == null)
return;
if (Manager.GetGame() != null && !Manager.GetGame().IdleKick) if (Manager.GetGame() != null && !Manager.GetGame().IdleKick)
return; return;

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
View File

@ -97,6 +97,9 @@ public class MiscManager implements Listener
@EventHandler @EventHandler
public void HubClockUpdate(UpdateEvent event) public void HubClockUpdate(UpdateEvent event)
{ {
if (Manager.IsTournamentServer())
return;
if (event.getType() != UpdateType.SLOW) if (event.getType() != UpdateType.SLOW)
return; return;
@ -121,6 +124,9 @@ public class MiscManager implements Listener
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void HubClockInteract(PlayerInteractEvent event) public void HubClockInteract(PlayerInteractEvent event)
{ {
if (Manager.IsTournamentServer())
return;
Player player = event.getPlayer(); Player player = event.getPlayer();
if (player.getItemInHand() == null) if (player.getItemInHand() == null)