Fixes
Bug Fixes and also /kill works now and also "killed by custom" is now "killed by AlexTheCoder's Wrath"
This commit is contained in:
parent
63a7f17624
commit
0f00db4e42
@ -12,6 +12,7 @@ import java.util.*;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
|
||||||
public enum PermissionGroup
|
public enum PermissionGroup
|
||||||
{
|
{
|
||||||
//PLAYER
|
//PLAYER
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
package mineplex.core.disguise.playerdisguise;
|
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.command.CommandBase;
|
||||||
import mineplex.core.common.util.F;
|
import mineplex.core.common.util.F;
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
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<PlayerDisguiseManager> implements Listener
|
public class DisguiseCommand extends CommandBase<PlayerDisguiseManager> implements Listener
|
||||||
{
|
{
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,15 +1,17 @@
|
|||||||
package mineplex.minecraft.game.core.combat;
|
package mineplex.minecraft.game.core.combat;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import mineplex.core.MiniClientPlugin;
|
||||||
import java.util.HashSet;
|
import mineplex.core.ReflectivelyCreateMiniPlugin;
|
||||||
import java.util.Iterator;
|
import mineplex.core.common.Pair;
|
||||||
import java.util.Map;
|
import mineplex.core.common.util.*;
|
||||||
import java.util.Set;
|
import mineplex.core.incognito.events.IncognitoStatusChangeEvent;
|
||||||
import java.util.UUID;
|
import mineplex.core.itemstack.ItemStackFactory;
|
||||||
import java.util.concurrent.TimeUnit;
|
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 net.minecraft.server.v1_8_R3.ItemStack;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack;
|
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.entity.PlayerDeathEvent;
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
|
|
||||||
import mineplex.core.MiniClientPlugin;
|
import java.util.*;
|
||||||
import mineplex.core.ReflectivelyCreateMiniPlugin;
|
import java.util.concurrent.TimeUnit;
|
||||||
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;
|
|
||||||
|
|
||||||
@ReflectivelyCreateMiniPlugin
|
@ReflectivelyCreateMiniPlugin
|
||||||
public class CombatManager extends MiniClientPlugin<ClientCombat>
|
public class CombatManager extends MiniClientPlugin<ClientCombat>
|
||||||
@ -259,7 +247,7 @@ public class CombatManager extends MiniClientPlugin<ClientCombat>
|
|||||||
source = "Cactus";
|
source = "Cactus";
|
||||||
break;
|
break;
|
||||||
case CUSTOM:
|
case CUSTOM:
|
||||||
source = "Custom";
|
source = "AlexTheCoder\'s Wrath";
|
||||||
break;
|
break;
|
||||||
case DROWNING:
|
case DROWNING:
|
||||||
source = "Water";
|
source = "Water";
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -245,7 +245,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed
|
|||||||
public boolean StrictAntiHack = false;
|
public boolean StrictAntiHack = false;
|
||||||
public boolean AnticheatDisabled = false;
|
public boolean AnticheatDisabled = false;
|
||||||
|
|
||||||
public boolean DisableKillCommand = true;
|
public boolean DisableKillCommand = false;
|
||||||
|
|
||||||
public boolean GadgetsDisabled = true;
|
public boolean GadgetsDisabled = true;
|
||||||
|
|
||||||
|
@ -45,12 +45,12 @@ import java.util.*;
|
|||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
|
||||||
//import com.mineplex.anticheat.checks.combat.KillauraTypeD;
|
//import com.mineplex.anticheat.checks.combat.KillauraTypeD;
|
||||||
//import mineplex.core.antihack.AntiHack;
|
//import mineplex.core.antihack.AntiHack;
|
||||||
|
|
||||||
public class CastleSiegeNew extends TeamGame
|
public class CastleSiegeNew extends TeamGame
|
||||||
{
|
{
|
||||||
|
|
||||||
private static final String[] DESCRIPTION = {
|
private static final String[] DESCRIPTION = {
|
||||||
C.cAqua + "Defenders" + C.cWhite + " must defend the King.",
|
C.cAqua + "Defenders" + C.cWhite + " must defend the King.",
|
||||||
C.cAqua + "Defenders" + C.cWhite + " win when the sun rises.",
|
C.cAqua + "Defenders" + C.cWhite + " win when the sun rises.",
|
||||||
@ -347,6 +347,7 @@ public class CastleSiegeNew extends TeamGame
|
|||||||
{
|
{
|
||||||
SetKit(player, _wolfKit, true);
|
SetKit(player, _wolfKit, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
|
@ -18,6 +18,7 @@ import java.lang.reflect.InvocationTargetException;
|
|||||||
|
|
||||||
//import mineplex.core.disguise.disguises.DisguiseWither;
|
//import mineplex.core.disguise.disguises.DisguiseWither;
|
||||||
|
|
||||||
|
|
||||||
public abstract class KitCastleSiege extends Kit
|
public abstract class KitCastleSiege extends Kit
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ import nautilus.game.arcade.kit.Perk;
|
|||||||
import nautilus.game.arcade.kit.perks.PerkConstructor;
|
import nautilus.game.arcade.kit.perks.PerkConstructor;
|
||||||
import nautilus.game.arcade.kit.perks.PerkMammoth;
|
import nautilus.game.arcade.kit.perks.PerkMammoth;
|
||||||
|
|
||||||
|
|
||||||
public class KitHumanKnight extends KitCastleSiege
|
public class KitHumanKnight extends KitCastleSiege
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@ import org.bukkit.Material;
|
|||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
public class KitHumanMarksman extends KitCastleSiege
|
public class KitHumanMarksman extends KitCastleSiege
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@ import org.bukkit.inventory.ItemStack;
|
|||||||
import org.bukkit.potion.PotionEffect;
|
import org.bukkit.potion.PotionEffect;
|
||||||
import org.bukkit.potion.PotionEffectType;
|
import org.bukkit.potion.PotionEffectType;
|
||||||
|
|
||||||
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
public class KitHumanPaladin extends KitCastleSiege
|
public class KitHumanPaladin extends KitCastleSiege
|
||||||
|
@ -1,7 +1,16 @@
|
|||||||
package nautilus.game.arcade.game.games.castlesiegenew.kits;
|
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.Effect;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
@ -12,18 +21,8 @@ import org.bukkit.event.EventPriority;
|
|||||||
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import mineplex.core.common.util.C;
|
import java.util.concurrent.TimeUnit;
|
||||||
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;
|
|
||||||
|
|
||||||
public class KitHumanWolf extends KitCastleSiege
|
public class KitHumanWolf extends KitCastleSiege
|
||||||
{
|
{
|
||||||
|
@ -15,6 +15,7 @@ import org.bukkit.entity.Player;
|
|||||||
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
|
||||||
public class KitUndeadSummoner extends KitCastleSiege
|
public class KitUndeadSummoner extends KitCastleSiege
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user