diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-07-27 16:10:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-27 16:10:09 +0100 |
commit | 377abc92775c607dcb84327210fcbba2056c9d7a (patch) | |
tree | 90ae65003d982ee8c13141b08bd2d7b6f2213338 | |
parent | 176199ac25971f649efa18696acf6c329d875442 (diff) | |
parent | 441931bc25a34041e99d267d703d7192d1b60169 (diff) | |
download | GT5-Unofficial-377abc92775c607dcb84327210fcbba2056c9d7a.tar.gz GT5-Unofficial-377abc92775c607dcb84327210fcbba2056c9d7a.tar.bz2 GT5-Unofficial-377abc92775c607dcb84327210fcbba2056c9d7a.zip |
Merge pull request #60 from alexandre-tardif/fix/ender-link-private
Fix ender link cover private mode
-rw-r--r-- | src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java | 2 | ||||
-rw-r--r-- | src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java index 081ce3b309..64bd1d940b 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkCoverMessage.java @@ -98,7 +98,7 @@ public class EnderLinkCoverMessage implements IMessage { bindEnderLinkTag(handler, tag); } else if (handler instanceof BaseMetaTileEntity) { BaseMetaTileEntity baseTile = (BaseMetaTileEntity) handler; - if (tag.getUUID() == baseTile.getOwnerUuid()){ + if (tag.getUUID().equals(baseTile.getOwnerUuid())){ bindEnderLinkTag(handler, tag); } } diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java index 315c5e5fff..92855499d9 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java @@ -12,7 +12,6 @@ import gregtech.api.gui.widgets.GT_GuiIconButton; import gregtech.api.gui.widgets.GT_GuiIntegerTextBox; import gregtech.api.interfaces.IGuiScreen; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.net.GT_Packet_TileEntityCover; import gregtech.api.util.GT_CoverBehavior; import gregtech.api.util.GT_Utility; @@ -28,6 +27,7 @@ import java.util.UUID; import static com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData.getEnderFluidContainer; import static com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData.getEnderLinkTag; +import static gregtech.GT_Mod.gregtechproxy; public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { private static final int L_PER_TICK = 8000; @@ -270,10 +270,7 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { private void switchPrivatePublic(int coverVar) { UUID ownerUUID = tag.getUUID(); if (testBit(coverVar, PUBLIC_PRIVATE_MASK)){ - if (tile instanceof BaseMetaTileEntity){ - BaseMetaTileEntity mte = (BaseMetaTileEntity) tile; - ownerUUID = mte.getOwnerUuid(); - } + ownerUUID = gregtechproxy.getThePlayer().getUniqueID(); } else { ownerUUID = null; } |