diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java index d1d9d299b..3d2ed939e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java @@ -287,6 +287,9 @@ public class AntiHack extends MiniPlugin public void sendReport(Player player, String report, String severity) { + if (severity.equals("Extreme")) + player.kickPlayer(C.cRed + "MAC" + C.cWhite + " - " + C.cYellow + "You were kicked for suspicious movement."); + //XXX Send to Database for Staff } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java index f3462bd78..f4e35fc5e 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java @@ -33,9 +33,10 @@ public class NewsManager extends MiniPlugin _news = new String[] { - "Europe Servers: " + C.cGreen + C.Bold + "BACK ONLINE" + ChatColor.RESET + "!", - "New SSM Kit: " + C.cYellow + C.Bold + "Magma Cube" + ChatColor.RESET + "!", - "New Rank: " + C.cPurple + C.Bold + "Hero Rank" + ChatColor.RESET + "!", + "Europe Servers: " + C.cGreen + C.Bold + "BACK ONLINE", + "New SSM Kit: " + C.cYellow + C.Bold + "Pig", + "SSM: " + C.cGreen + C.Bold + "Many kits rebalanced!", + "New Rank: " + C.cPurple + C.Bold + "Hero Rank", }; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/Gravity.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/Gravity.java index 0ae426105..a0b46dc50 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/Gravity.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/Gravity.java @@ -49,6 +49,8 @@ public class Gravity extends SoloGame this.DamagePvP = false; this.HungerSet = 20; + + this.WorldTimeSet = 22; } @EventHandler @@ -106,7 +108,7 @@ public class Gravity extends SoloGame FallingBlock projectile = player.getWorld().spawnFallingBlock(player.getEyeLocation().add(player.getLocation().getDirection().multiply(2)), Material.SKULL, (byte)0); - _objects.add(new GravityObject(this, projectile, 40, velocity)); + _objects.add(new GravityObject(this, projectile, 20, velocity)); } @EventHandler @@ -128,7 +130,7 @@ public class Gravity extends SoloGame if (event.getType() != UpdateType.TICK) return; - if (!InProgress()) + if (!InProgress() && GetState() != GameState.End) return; //Movement + Invalid diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/GravityObject.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/GravityObject.java index 730741de6..c657351dd 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/GravityObject.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/GravityObject.java @@ -66,6 +66,10 @@ public class GravityObject if (!Base.isValid()) return false; + if (IsPlayer()) + if (!Host.IsAlive((Player)Ent)) + return false; + if (Ent.getVehicle() == null) { Base.setPassenger(Ent);