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

Attempt 2 at fakeplayer lookup fix

Browse source 
Removes the name checker and is now based on class names.
This commit is contained in:
Nick 2016-01-22 17:19:01 -08:00
parent 4b9eaa90d8
commit 2d6b4611ef
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java
View file

@ -4,6 +4,7 @@ import WayofTime.bloodmagic.api.Constants;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion; import net.minecraft.potion.Potion;
@ -14,12 +15,18 @@ import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import java.util.ArrayList;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Pattern;
public class PlayerHelper public class PlayerHelper
{ {
private static final Pattern FAKE_PLAYER_PATTERN = Pattern.compile("^(?:\\[.*\\])|(?:ComputerCraft)$"); /**
* A list of all known fake players that do not extend FakePlayer.
*
* Will be added to as needed.
*/
private static final ArrayList<String> knownFakePlayers = Lists.newArrayList(
);
public static String getUsernameFromPlayer(EntityPlayer player) public static String getUsernameFromPlayer(EntityPlayer player)
{ {
@ -68,7 +75,7 @@ public class PlayerHelper
public static boolean isFakePlayer(EntityPlayer player) public static boolean isFakePlayer(EntityPlayer player)
{ {
return player != null && (player instanceof FakePlayer || FAKE_PLAYER_PATTERN.matcher(getUsernameFromPlayer(player)).matches()); return player != null && (player instanceof FakePlayer || knownFakePlayers.contains(player.getClass().getCanonicalName()));
} }
public static void causeNauseaToPlayer(ItemStack stack) public static void causeNauseaToPlayer(ItemStack stack)