Created Server-safe method to get EntityPlayer from GameProfile

This commit is contained in:
mezz committed 2014-09-18 22:41:48 -07:00
1 parent c51e01987c
commit fe8d55f38f
9 files changed
+34 -15

No files matched your search

@@ -43,7 +43,7 @@ import forestry.core.EnumErrorCode;
import forestry.core.config.Config;
import forestry.core.config.Defaults;
import forestry.core.config.ForestryItem;
import forestry.core.fluids.tanks.StandardTank;
import forestry.core.proxy.Proxies;
import forestry.core.fluids.tanks.FilteredTank;
import forestry.core.fluids.TankManager;
import forestry.core.gadgets.TileBase;
@@ -456,7 +456,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL
}
private boolean removeSets(int count, ItemStack[] set) {
EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName());
EntityPlayer player = Proxies.common.getPlayer(worldObj, owner);
return accessibleInventory.removeSets(count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true);
}
@@ -39,6 +39,7 @@ import forestry.core.interfaces.ICrafter;
import forestry.core.interfaces.ICraftingPlan;
import forestry.core.interfaces.ILiquidTankContainer;
import forestry.core.network.GuiId;
import forestry.core.proxy.Proxies;
import forestry.core.fluids.tanks.StandardTank;
import forestry.core.fluids.TankManager;
import forestry.core.fluids.tanks.FilteredTank;
@@ -505,7 +506,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial
public ItemStack[] extractItem(boolean doRemove, ForgeDirection from, int maxItemCount) {
ItemStack taken;
if (doRemove) {
EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName());
EntityPlayer player = Proxies.common.getPlayer(worldObj, owner);
taken = this.takenFromSlot(SLOT_RESULT, false, player);
} else {
taken = this.getResult();
@@ -49,6 +49,7 @@ import forestry.core.utils.EnumTankLevel;
import forestry.core.fluids.tanks.StandardTank;
import forestry.core.fluids.tanks.FilteredTank;
import forestry.core.fluids.TankManager;
import forestry.core.proxy.Proxies;
import forestry.core.utils.InventoryAdapter;
import forestry.core.utils.LiquidHelper;
import forestry.core.utils.StackUtils;
@@ -351,7 +352,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I
}
private boolean removeResources(ItemStack[] stacks) {
EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName());
EntityPlayer player = Proxies.common.getPlayer(worldObj, owner);
return inventory.removeSets(1, stacks, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT, player, false, true, true);
}