From a8583bfbfdccdd1db5ca8353407cd836da64c5fc Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 28 Sep 2014 21:54:30 -0700 Subject: [PATCH] removed isClientPlayer from MailAddress --- api | 2 +- src/main/java/forestry/mail/MailAddress.java | 10 ---------- src/main/java/forestry/mail/proxy/ClientProxyMail.java | 4 +++- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/api b/api index 5836e53d0..f3a061a11 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 5836e53d01711f08e66acfb859a006bc506cc015 +Subproject commit f3a061a11f8880ff5be50ab5674034a419ac64c4 diff --git a/src/main/java/forestry/mail/MailAddress.java b/src/main/java/forestry/mail/MailAddress.java index 2e9563d6e..4d5df00b8 100644 --- a/src/main/java/forestry/mail/MailAddress.java +++ b/src/main/java/forestry/mail/MailAddress.java @@ -143,16 +143,6 @@ public class MailAddress implements INBTTagable, IMailAddress { return address; } - public boolean isClientPlayer(World world) { - if (!this.isPlayer()) - return false; - - EntityPlayer addressPlayer = Proxies.common.getPlayer(world, gameProfile); - EntityPlayer clientPlayer = Proxies.common.getPlayer(); - - return addressPlayer != null && clientPlayer != null && clientPlayer.equals(addressPlayer); - } - public GameProfile getPlayerProfile() { if (!this.isPlayer()) return null; diff --git a/src/main/java/forestry/mail/proxy/ClientProxyMail.java b/src/main/java/forestry/mail/proxy/ClientProxyMail.java index 7ffa4b197..9185498bd 100755 --- a/src/main/java/forestry/mail/proxy/ClientProxyMail.java +++ b/src/main/java/forestry/mail/proxy/ClientProxyMail.java @@ -11,6 +11,7 @@ package forestry.mail.proxy; import com.mojang.authlib.GameProfile; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import forestry.core.network.ForestryPacket; @@ -50,7 +51,8 @@ public class ClientProxyMail extends ProxyMail { @Override public void setPOBoxInfo(World world, IMailAddress address, POBoxInfo info) { - if (address.isClientPlayer(world)) + EntityPlayer clientPlayer = Proxies.common.getPlayer(); + if (clientPlayer != null && clientPlayer.getGameProfile().equals(address.getPlayerProfile())) GuiMailboxInfo.instance.setPOBoxInfo(info); } }