diff --git a/Plugins/BuildFiles/common.xml b/Plugins/BuildFiles/common.xml index 9e5c28d67..15cf77727 100644 --- a/Plugins/BuildFiles/common.xml +++ b/Plugins/BuildFiles/common.xml @@ -246,8 +246,8 @@ - - + + diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath index 9a8b522e3..8bb62ab28 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath @@ -2,11 +2,10 @@ - - + diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java index c837e9ad1..7ff8b3bc9 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java @@ -138,7 +138,7 @@ public class MarkedForDeath extends SkillActive } //Vuln - Factory.Condition().Factory().Vulnerable(GetName(), damagee, damager, duration, 3, true, true, true); + Factory.Condition().Factory().Vulnerable(GetName(), damagee, damager, duration, 1, true, true, true); //Damage event.AddMod(damager.getName(), GetName(), 0, true); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java index 1f799d1a0..c2e2f460f 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java @@ -1,6 +1,5 @@ package mineplex.minecraft.game.classcombat.Skill.Brute; -import java.util.HashMap; import java.util.HashSet; import org.bukkit.Effect; @@ -14,12 +13,14 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEntityEvent; +import org.bukkit.event.vehicle.VehicleExitEvent; import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType; import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.core.common.util.F; import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.UpdateType; +import mineplex.core.common.util.NautHashMap; import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilEnt; @@ -36,8 +37,8 @@ public class DwarfToss extends SkillActive { private long _chargeTime = 4000; private HashSet _used = new HashSet(); - private HashMap _holding = new HashMap(); - private HashMap _charge = new HashMap(); + private NautHashMap _holding = new NautHashMap(); + private NautHashMap _charge = new NautHashMap(); private HashSet _charged = new HashSet(); public DwarfToss(SkillFactory skills, String name, ClassType classType, SkillType skillType, @@ -120,6 +121,22 @@ public class DwarfToss extends SkillActive //Allow return true; } + + @EventHandler + public void PreventDismount(VehicleExitEvent event) + { + if (event.isCancelled()) + return; + + if (!(event.getExited() instanceof Player)) + return; + + if (!(event.getVehicle() instanceof Player)) + return; + + if (_holding.containsKey((Player)event.getVehicle()) && _holding.get((Player)event.getVehicle()) == event.getExited()) + event.setCancelled(true); + } @EventHandler public void Grab(PlayerInteractEntityEvent event) @@ -161,8 +178,8 @@ public class DwarfToss extends SkillActive } //Hold Loop - if (_holding.containsKey(target)) - if (_holding.get(target).equals(player)) + if (target instanceof Player && _holding.containsKey((Player)target)) + if (_holding.get((Player)target).equals(player)) if (target instanceof Player) { UtilPlayer.message(player, F.main(GetClassType().name(), F.name(((Player)target).getName()) + " is already holding you.")); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java index 3be7fa691..525f863ab 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java @@ -153,7 +153,7 @@ public class ArcticArmor extends Skill Factory.BlockRestore().Add(block, 79, (byte)0, (long)(duration * (1 + blocks.get(block)))); //Snow - Factory.BlockRestore().Snow(block, (byte)1, (byte)1, (long)(duration * (1 + blocks.get(block))), 250, 0); + Factory.BlockRestore().Snow(block, (byte)0, (byte)0, (long)(duration * (1 + blocks.get(block))), 250, 0); } } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Void.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Void.java index 6e80f1a5e..2e63870b3 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Void.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Void.java @@ -73,6 +73,8 @@ public class Void extends Skill //Remove Condition Factory.Condition().EndCondition(event.getPlayer(), null, GetName()); + + Factory.Energy().RemoveEnergySwingMod(player, GetName()); } else { @@ -84,6 +86,8 @@ public class Void extends Skill //Remove Condition Factory.Condition().EndCondition(event.getPlayer(), null, GetName()); + + Factory.Energy().AddEnergySwingMod(player, GetName(), -4); } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java index 701991862..e6f5881a2 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java @@ -75,11 +75,10 @@ public class Sharpshooter extends Skill //Damage event.AddMod(player.getName(), GetName(), _hitCount.get(player) * 2, true); - //Increment - _hitCount.put(player, _hitCount.get(player) + 1); - - int limit = Math.min(3, _hitCount.get(player)); + int limit = Math.min(3, _hitCount.get(player) + 1); + _hitCount.put(player, limit); + //Inform UtilPlayer.message(projectile.getShooter(), F.main(GetClassType().name(), GetName() + ": " + F.elem(_hitCount.get(player) + " Consecutive Hits") + C.cGray + " (" + F.skill("+"+ (limit * 2) + "Damage" ) + C.cGray + ")" ) ); @@ -91,7 +90,7 @@ public class Sharpshooter extends Skill projectile.remove(); } - + @EventHandler public void Clean(UpdateEvent event) { @@ -101,7 +100,7 @@ public class Sharpshooter extends Skill HashSet remove = new HashSet(); for (Entity cur : _arrows.keySet()) - if (cur.isDead() || !cur.isValid()) + if (cur.isDead() || !cur.isValid() || cur.isOnGround()) remove.add(cur); for (Entity cur : remove) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java index ef7b650ca..72a5d3cca 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java @@ -39,10 +39,14 @@ public class Web extends ItemUsable @Override public void Collide(LivingEntity target, Block block, ProjectileUser data) { - double distance = UtilMath.offset(target.getLocation(), data.GetThrown().getLocation()); - if (distance > .75) + if (target != null) { - data.GetThrown().teleport(data.GetThrown().getLocation().add(new Vector(0, -distance / 2, 0))); + double distance = UtilMath.offset(target.getLocation(), data.GetThrown().getLocation()); + + if (distance > .75) + { + data.GetThrown().teleport(data.GetThrown().getLocation().add(new Vector(0, -distance / 2, 0))); + } } CreateWeb(data.GetThrown()); diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/GamePlugin.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/GamePlugin.class deleted file mode 100644 index eec622dd8..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/GamePlugin.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/Arena.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/Arena.class deleted file mode 100644 index 83b387a50..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/Arena.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/ArenaManager$1.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/ArenaManager$1.class deleted file mode 100644 index 7b7e0dd77..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/ArenaManager$1.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/ArenaManager.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/ArenaManager.class deleted file mode 100644 index 4e9592454..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/ArenaManager.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/IArena.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/IArena.class deleted file mode 100644 index 87e46ac95..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/IArena.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/IArenaParser.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/IArenaParser.class deleted file mode 100644 index 08eaa9c99..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/IArenaParser.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/IArenaReloadedListener.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/IArenaReloadedListener.class deleted file mode 100644 index 80b443a41..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/IArenaReloadedListener.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/ITeamArena.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/ITeamArena.class deleted file mode 100644 index 54f8eccca..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/ITeamArena.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/Region.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/Region.class deleted file mode 100644 index 2eff5d677..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/Region.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/RegionManager.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/RegionManager.class deleted file mode 100644 index 143d14b43..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/RegionManager.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/TeamArena.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/TeamArena.class deleted file mode 100644 index 28d099258..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/TeamArena.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BlueShopPoints.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BlueShopPoints.class deleted file mode 100644 index b9c7134d5..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BlueShopPoints.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BlueSpawnPoints.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BlueSpawnPoints.class deleted file mode 100644 index 164c974fe..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BlueSpawnPoints.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BlueSpawnRoom.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BlueSpawnRoom.class deleted file mode 100644 index 95ea762f6..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BlueSpawnRoom.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BorderProperty.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BorderProperty.class deleted file mode 100644 index 5325b4dd4..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/BorderProperty.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/Center.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/Center.class deleted file mode 100644 index 2d746a658..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/Center.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/IProperty.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/IProperty.class deleted file mode 100644 index c462b44dc..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/IProperty.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/MapName.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/MapName.class deleted file mode 100644 index bdde32a6c..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/MapName.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/Offset.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/Offset.class deleted file mode 100644 index a7b3e1c80..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/Offset.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/PropertyBase.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/PropertyBase.class deleted file mode 100644 index 357cf9249..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/PropertyBase.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RedShopPoints.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RedShopPoints.class deleted file mode 100644 index 51aba4fe4..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RedShopPoints.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RedSpawnPoints.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RedSpawnPoints.class deleted file mode 100644 index aae01d35d..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RedSpawnPoints.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RedSpawnRoom.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RedSpawnRoom.class deleted file mode 100644 index 8ea82032e..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RedSpawnRoom.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RegionPropertyBase.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RegionPropertyBase.class deleted file mode 100644 index 29466117b..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/arena/property/RegionPropertyBase.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/GameEngine.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/GameEngine.class deleted file mode 100644 index 5d8d6b7b2..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/GameEngine.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/GameScheduler.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/GameScheduler.class deleted file mode 100644 index e7657dff9..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/GameScheduler.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/IGameEngine.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/IGameEngine.class deleted file mode 100644 index 3fe3eeaf4..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/IGameEngine.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/ITeam.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/ITeam.class deleted file mode 100644 index 59e5bcc9e..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/ITeam.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/ITeamGameEngine.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/ITeamGameEngine.class deleted file mode 100644 index c20dc1e84..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/ITeamGameEngine.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamGameEngine$1.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamGameEngine$1.class deleted file mode 100644 index 051bb81e6..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamGameEngine$1.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamGameEngine$2.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamGameEngine$2.class deleted file mode 100644 index af0db0bd7..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamGameEngine$2.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamGameEngine.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamGameEngine.class deleted file mode 100644 index 15e3993c1..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamGameEngine.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamType.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamType.class deleted file mode 100644 index cea1348d7..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/engine/TeamType.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameActivatedEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameActivatedEvent.class deleted file mode 100644 index dde91d53a..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameActivatedEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameDeactivatedEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameDeactivatedEvent.class deleted file mode 100644 index 27129eab8..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameDeactivatedEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameEvent.class deleted file mode 100644 index ea8ba52b4..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameFinishedEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameFinishedEvent.class deleted file mode 100644 index b84cec064..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameFinishedEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerAfkEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerAfkEvent.class deleted file mode 100644 index e4080a8c8..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerAfkEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerAttackedPlayerEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerAttackedPlayerEvent.class deleted file mode 100644 index dba4a573f..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerAttackedPlayerEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerDeathEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerDeathEvent.class deleted file mode 100644 index 47717d4a5..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerDeathEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerJoinedEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerJoinedEvent.class deleted file mode 100644 index 59b82e7df..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerJoinedEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerQuitEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerQuitEvent.class deleted file mode 100644 index a6fefc023..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GamePlayerQuitEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameStartedEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameStartedEvent.class deleted file mode 100644 index 3514eae6f..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/GameStartedEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/team/TeamGameFinishedEvent.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/team/TeamGameFinishedEvent.class deleted file mode 100644 index 3b7b61bf8..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/events/team/TeamGameFinishedEvent.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Game$1.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Game$1.class deleted file mode 100644 index 5feac0b32..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Game$1.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Game$2.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Game$2.class deleted file mode 100644 index 9ca494331..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Game$2.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Game.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Game.class deleted file mode 100644 index 2f6bdb680..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Game.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/IGame.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/IGame.class deleted file mode 100644 index 66bdd8746..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/IGame.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/ITeamGame.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/ITeamGame.class deleted file mode 100644 index 3984fb8b9..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/ITeamGame.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Team.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Team.class deleted file mode 100644 index 91a95d650..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/Team.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/TeamGame.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/TeamGame.class deleted file mode 100644 index 37f9b1503..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/game/TeamGame.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/notifier/IPlayerNotifier.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/notifier/IPlayerNotifier.class deleted file mode 100644 index 92fb0b51b..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/notifier/IPlayerNotifier.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/notifier/PlayerNotifier.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/notifier/PlayerNotifier.class deleted file mode 100644 index 607938125..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/notifier/PlayerNotifier.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/notifier/TeamPlayerNotifier.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/notifier/TeamPlayerNotifier.class deleted file mode 100644 index 08ed72d5d..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/notifier/TeamPlayerNotifier.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/GamePlayer.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/GamePlayer.class deleted file mode 100644 index 67e167b79..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/GamePlayer.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/IGamePlayer.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/IGamePlayer.class deleted file mode 100644 index 371ab95b5..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/IGamePlayer.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/ITeamGamePlayer.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/ITeamGamePlayer.class deleted file mode 100644 index 06daac693..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/ITeamGamePlayer.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/TeamGamePlayer.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/TeamGamePlayer.class deleted file mode 100644 index 6efaa2522..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/player/TeamGamePlayer.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/IScoreHandler.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/IScoreHandler.class deleted file mode 100644 index 7d99fc223..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/IScoreHandler.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/ITeamScoreHandler.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/ITeamScoreHandler.class deleted file mode 100644 index 1d1a6b3a7..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/ITeamScoreHandler.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/LineTracker.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/LineTracker.class deleted file mode 100644 index a04e3884f..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/LineTracker.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/PlayerPointSorter.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/PlayerPointSorter.class deleted file mode 100644 index 078aef352..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/PlayerPointSorter.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/TabScoreboard.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/TabScoreboard.class deleted file mode 100644 index b8addce80..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/TabScoreboard.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/TeamGameScoreHandler.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/TeamGameScoreHandler.class deleted file mode 100644 index 09d72c810..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/scoreboard/TeamGameScoreHandler.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastMinuteTimer$1.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastMinuteTimer$1.class deleted file mode 100644 index 443daac1a..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastMinuteTimer$1.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastMinuteTimer$2.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastMinuteTimer$2.class deleted file mode 100644 index 1c4ddcd63..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastMinuteTimer$2.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastMinuteTimer.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastMinuteTimer.class deleted file mode 100644 index 53929a552..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastMinuteTimer.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastSecondTimer$1.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastSecondTimer$1.class deleted file mode 100644 index 337f414e3..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastSecondTimer$1.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastSecondTimer.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastSecondTimer.class deleted file mode 100644 index 454d5967b..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastSecondTimer.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastTimer.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastTimer.class deleted file mode 100644 index 05956f5cb..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/BroadcastTimer.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/NullChunkGenerator.class b/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/NullChunkGenerator.class deleted file mode 100644 index 665a9eda0..000000000 Binary files a/Plugins/Nautilus.Game.Core/bin/nautilus/game/core/util/NullChunkGenerator.class and /dev/null differ diff --git a/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java b/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java index 9a8c3365b..6277aa861 100644 --- a/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java +++ b/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java @@ -40,6 +40,7 @@ import mineplex.minecraft.game.core.combat.*; import mineplex.minecraft.game.core.damage.DamageManager; import mineplex.minecraft.game.core.fire.Fire; import mineplex.minecraft.game.core.mechanics.PistonJump; +import mineplex.minecraft.game.core.mechanics.Weapon; import nautilus.game.core.util.NullChunkGenerator; import org.bukkit.Location; @@ -118,6 +119,7 @@ public abstract class GamePlugin extends JavaPlugin implements IRelation new AntiStack(this); new MemoryFix(this); new PistonJump(this); + new Weapon(this, Energy); getServer().getScheduler().scheduleSyncRepeatingTask(this, updater, 1, 1); diff --git a/Plugins/Nautilus.Game.Core/src/nautilus/game/core/engine/GameEngine.java b/Plugins/Nautilus.Game.Core/src/nautilus/game/core/engine/GameEngine.java index d3096b0dc..234a69693 100644 --- a/Plugins/Nautilus.Game.Core/src/nautilus/game/core/engine/GameEngine.java +++ b/Plugins/Nautilus.Game.Core/src/nautilus/game/core/engine/GameEngine.java @@ -769,6 +769,7 @@ public abstract class GameEngine, if (event.getResult() != Result.KICK_BANNED && IsPlayerInGame(event.getPlayer())) { event.allow(); + return; } if (ActiveGames.size() > 0 || GamesInSetup.size() > 0) diff --git a/Plugins/Nautilus.Game.Dominate/src/nautilus/game/dominate/scoreboard/DominateTabScoreboard.java b/Plugins/Nautilus.Game.Dominate/src/nautilus/game/dominate/scoreboard/DominateTabScoreboard.java index 9f35afd2e..fb789f9a9 100644 --- a/Plugins/Nautilus.Game.Dominate/src/nautilus/game/dominate/scoreboard/DominateTabScoreboard.java +++ b/Plugins/Nautilus.Game.Dominate/src/nautilus/game/dominate/scoreboard/DominateTabScoreboard.java @@ -36,7 +36,7 @@ public class DominateTabScoreboard extends TabScoreboard