lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #264 from Vazkii/patch-2

Browse source 
Better fake player checking.
This commit is contained in:
WayofTime 2015-02-27 18:33:01 -05:00
commit 660c1f66bd
1 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
View file

@ -313,25 +313,10 @@ public class SpellHelper
return isFakePlayer(player); return isFakePlayer(player);
} }
private static final Pattern FAKE_PLAYER_PATTERN = Pattern.compile("^(?:\\[.*\\])|(?:ComputerCraft)$");
public static boolean isFakePlayer(EntityPlayer player) public static boolean isFakePlayer(EntityPlayer player)
{ {
if (player instanceof FakePlayer || SpellHelper.getUsername(player).equals("[CoFH]") || SpellHelper.getUsername(player).startsWith("[Thaumcraft")) return player instanceof FakePlayer || FAKE_PLAYER_PATTERN.matcher(SpellHelper.getUsername(player)).matches();
{
return true;
}
String str = player.getClass().getSimpleName();
if (str.contains("GC"))
{
return false;
}
if (player.getClass().equals(EntityPlayerMP.class))
{
return false;
}
return false;
} }
public static void smashBlock(World world, int posX, int posY, int posZ) public static void smashBlock(World world, int posX, int posY, int posZ)