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

Potential fix for a bunch of stuff that required the use of UUID -> username lookup on servers. This fix adds an extra tag to the NBT of items so that it caches the username of the owner. The UUID is still stored on items, but is not used client-side.

Browse source
This commit is contained in:
WayofTime 2016-01-13 19:59:28 -05:00
parent 14459ddc69
commit ec7676a69c
6 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ public class PlayerHelper
public static String getUsernameFromPlayer(EntityPlayer player)
{
return UsernameCache.getLastKnownUsername(getUUIDFromPlayer(player));
return player.worldObj.isRemote ? "" : UsernameCache.getLastKnownUsername(getUUIDFromPlayer(player));
}
public static EntityPlayer getPlayerFromUsername(String username)
@ -63,16 +63,19 @@ public class PlayerHelper
{
stack = NBTHelper.checkNBT(stack);
return PlayerHelper.getUsernameFromUUID(stack.getTagCompound().getString(Constants.NBT.OWNER_UUID));
return stack.getTagCompound().getString(Constants.NBT.OWNER_NAME);
}
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 || FAKE_PLAYER_PATTERN.matcher(getUsernameFromPlayer(player)).matches());
}
public static void causeNauseaToPlayer(ItemStack stack)
{
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
return;
stack = NBTHelper.checkNBT(stack);
if (!Strings.isNullOrEmpty(stack.getTagCompound().getString(Constants.NBT.OWNER_UUID)))