diff --git a/Mineplex.Core/src/mineplex/core/account/permissions/PermissionGroup.java b/Mineplex.Core/src/mineplex/core/account/permissions/PermissionGroup.java index 4091c249..c09eb3e9 100644 --- a/Mineplex.Core/src/mineplex/core/account/permissions/PermissionGroup.java +++ b/Mineplex.Core/src/mineplex/core/account/permissions/PermissionGroup.java @@ -12,6 +12,7 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; + public enum PermissionGroup { //PLAYER diff --git a/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/DisguiseCommand.java b/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/DisguiseCommand.java index 5d595e24..3fcf2d56 100644 --- a/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/DisguiseCommand.java +++ b/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/DisguiseCommand.java @@ -1,14 +1,14 @@ package mineplex.core.disguise.playerdisguise; -import java.util.UUID; - -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import org.bukkit.event.Listener; - import mineplex.core.command.CommandBase; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; +import org.bukkit.event.Listener; + +import java.util.UUID; + public class DisguiseCommand extends CommandBase implements Listener { diff --git a/Mineplex.Core/target/classes/mineplex/core/account/permissions/PermissionGroup.class b/Mineplex.Core/target/classes/mineplex/core/account/permissions/PermissionGroup.class index 19aa9756..f1e3c89f 100644 Binary files a/Mineplex.Core/target/classes/mineplex/core/account/permissions/PermissionGroup.class and b/Mineplex.Core/target/classes/mineplex/core/account/permissions/PermissionGroup.class differ diff --git a/Mineplex.Core/target/classes/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager$Perm.class b/Mineplex.Core/target/classes/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager$Perm.class index 9b5b53d3..cba88ff1 100644 Binary files a/Mineplex.Core/target/classes/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager$Perm.class and b/Mineplex.Core/target/classes/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager$Perm.class differ diff --git a/Mineplex.Core/target/classes/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.class b/Mineplex.Core/target/classes/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.class index f17a463e..2d0d9901 100644 Binary files a/Mineplex.Core/target/classes/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.class and b/Mineplex.Core/target/classes/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.class differ diff --git a/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java b/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java index f9020e92..3cb7bd3b 100644 --- a/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java +++ b/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java @@ -1,15 +1,17 @@ package mineplex.minecraft.game.core.combat; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - +import mineplex.core.MiniClientPlugin; +import mineplex.core.ReflectivelyCreateMiniPlugin; +import mineplex.core.common.Pair; +import mineplex.core.common.util.*; +import mineplex.core.incognito.events.IncognitoStatusChangeEvent; +import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; +import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; +import mineplex.minecraft.game.core.combat.event.CombatQuitEvent; +import mineplex.minecraft.game.core.damage.CustomDamageEvent; import net.minecraft.server.v1_8_R3.ItemStack; - import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack; @@ -24,22 +26,8 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerQuitEvent; -import mineplex.core.MiniClientPlugin; -import mineplex.core.ReflectivelyCreateMiniPlugin; -import mineplex.core.common.Pair; -import mineplex.core.common.util.C; -import mineplex.core.common.util.F; -import mineplex.core.common.util.UtilEnt; -import mineplex.core.common.util.UtilEvent; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.common.util.UtilServer; -import mineplex.core.incognito.events.IncognitoStatusChangeEvent; -import mineplex.core.itemstack.ItemStackFactory; -import mineplex.core.updater.UpdateType; -import mineplex.core.updater.event.UpdateEvent; -import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; -import mineplex.minecraft.game.core.combat.event.CombatQuitEvent; -import mineplex.minecraft.game.core.damage.CustomDamageEvent; +import java.util.*; +import java.util.concurrent.TimeUnit; @ReflectivelyCreateMiniPlugin public class CombatManager extends MiniClientPlugin @@ -259,7 +247,7 @@ public class CombatManager extends MiniClientPlugin source = "Cactus"; break; case CUSTOM: - source = "Custom"; + source = "AlexTheCoder\'s Wrath"; break; case DROWNING: source = "Water"; diff --git a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$1.class b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$1.class index 12977d23..ecb79cec 100644 Binary files a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$1.class and b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$1.class differ diff --git a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$AttackReason.class b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$AttackReason.class index e13a097b..00188cc7 100644 Binary files a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$AttackReason.class and b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$AttackReason.class differ diff --git a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager.class b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager.class index b0c58829..937e6cea 100644 Binary files a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager.class and b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager.class differ diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index 86e51a38..231e3380 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -245,7 +245,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed public boolean StrictAntiHack = false; public boolean AnticheatDisabled = false; - public boolean DisableKillCommand = true; + public boolean DisableKillCommand = false; public boolean GadgetsDisabled = true; diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java index 53832e89..807f695b 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java @@ -45,12 +45,12 @@ import java.util.*; import java.util.Map.Entry; import java.util.concurrent.TimeUnit; + //import com.mineplex.anticheat.checks.combat.KillauraTypeD; //import mineplex.core.antihack.AntiHack; public class CastleSiegeNew extends TeamGame { - private static final String[] DESCRIPTION = { C.cAqua + "Defenders" + C.cWhite + " must defend the King.", C.cAqua + "Defenders" + C.cWhite + " win when the sun rises.", @@ -347,6 +347,7 @@ public class CastleSiegeNew extends TeamGame { SetKit(player, _wolfKit, true); } + } @EventHandler diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitCastleSiege.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitCastleSiege.java index de1941ac..05f71e67 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitCastleSiege.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitCastleSiege.java @@ -18,6 +18,7 @@ import java.lang.reflect.InvocationTargetException; //import mineplex.core.disguise.disguises.DisguiseWither; + public abstract class KitCastleSiege extends Kit { diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.java index e1e8e58d..8bd66c4a 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.java @@ -14,6 +14,7 @@ import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.perks.PerkConstructor; import nautilus.game.arcade.kit.perks.PerkMammoth; + public class KitHumanKnight extends KitCastleSiege { diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.java index 94118003..1952be5b 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.java @@ -11,6 +11,7 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; + public class KitHumanMarksman extends KitCastleSiege { diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java index a987c024..76522bf8 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java @@ -13,6 +13,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; + import java.util.concurrent.TimeUnit; public class KitHumanPaladin extends KitCastleSiege diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanWolf.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanWolf.java index 53bc9831..a16fb216 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanWolf.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanWolf.java @@ -1,7 +1,16 @@ package nautilus.game.arcade.game.games.castlesiegenew.kits; -import java.util.concurrent.TimeUnit; - +import mineplex.core.common.util.C; +import mineplex.core.common.util.F; +import mineplex.core.disguise.disguises.DisguiseWolf; +import mineplex.core.game.kit.GameKit; +import mineplex.core.itemstack.ItemBuilder; +import mineplex.core.recharge.Recharge; +import mineplex.minecraft.game.core.damage.CustomDamageEvent; +import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.kit.Perk; +import nautilus.game.arcade.kit.perks.PerkKnockbackGive; +import nautilus.game.arcade.kit.perks.PerkStrength; import org.bukkit.Effect; import org.bukkit.Material; import org.bukkit.Sound; @@ -12,18 +21,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.inventory.ItemStack; -import mineplex.core.common.util.C; -import mineplex.core.common.util.F; -import mineplex.core.disguise.disguises.DisguiseWolf; -import mineplex.core.game.kit.GameKit; -import mineplex.core.itemstack.ItemBuilder; -import mineplex.core.recharge.Recharge; -import mineplex.minecraft.game.core.damage.CustomDamageEvent; +import java.util.concurrent.TimeUnit; -import nautilus.game.arcade.ArcadeManager; -import nautilus.game.arcade.kit.Perk; -import nautilus.game.arcade.kit.perks.PerkKnockbackGive; -import nautilus.game.arcade.kit.perks.PerkStrength; public class KitHumanWolf extends KitCastleSiege { diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java index 5aac0a25..205a9485 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java @@ -15,6 +15,7 @@ import org.bukkit.entity.Player; import java.util.concurrent.TimeUnit; + public class KitUndeadSummoner extends KitCastleSiege { diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/Game.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/Game.class index b45a60b1..f7d0cb9b 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/Game.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/Game.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitCastleSiege.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitCastleSiege.class index 3c39889f..ca8dc501 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitCastleSiege.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitCastleSiege.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.class index 7e3c93b8..1d16b80c 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.class index 98f341e6..ffcd9394 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanMarksman.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.class index fedbf134..c9fee24c 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanWolf.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanWolf.class index ec60367e..71c33940 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanWolf.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanWolf.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.class index d56f3ec6..9693ded4 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.class differ diff --git a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar index 439f8cb5..744b0ce8 100644 Binary files a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar and b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar differ