From 074e4ba25f5c11800731a5dd721723dae1e766e8 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 27 Feb 2015 23:23:19 +0000 Subject: [PATCH 1/2] Better fake player checking. --- .../spell/complex/effect/SpellHelper.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java index e9460ab4..151a79b8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java @@ -313,25 +313,10 @@ public class SpellHelper return isFakePlayer(player); } + private static final Pattern FAKE_PLAYER_PATTERN = Pattern.compile("^(?:\\[.*\\])|(?:ComputerCraft)$"); public static boolean isFakePlayer(EntityPlayer player) { - if (player instanceof FakePlayer || SpellHelper.getUsername(player).equals("[CoFH]") || SpellHelper.getUsername(player).startsWith("[Thaumcraft")) - { - return true; - } - - String str = player.getClass().getSimpleName(); - if (str.contains("GC")) - { - return false; - } - - if (player.getClass().equals(EntityPlayerMP.class)) - { - return false; - } - - return false; + return player instanceof FakePlayer || FAKE_PLAYER_PATTERN.matcher(name).matches(); } public static void smashBlock(World world, int posX, int posY, int posZ) From 09b041e48e02667e4c63622e33cd2a74cf0f826f Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 27 Feb 2015 23:24:44 +0000 Subject: [PATCH 2/2] Derp --- .../common/spell/complex/effect/SpellHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java index 151a79b8..350a20bd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java @@ -316,7 +316,7 @@ public class SpellHelper private static final Pattern FAKE_PLAYER_PATTERN = Pattern.compile("^(?:\\[.*\\])|(?:ComputerCraft)$"); public static boolean isFakePlayer(EntityPlayer player) { - return player instanceof FakePlayer || FAKE_PLAYER_PATTERN.matcher(name).matches(); + return player instanceof FakePlayer || FAKE_PLAYER_PATTERN.matcher(SpellHelper.getUsername(player)).matches(); } public static void smashBlock(World world, int posX, int posY, int posZ)