diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-07-01 17:35:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 17:35:30 +0200 |
| commit | 4fbd38eb0b835d640c8ebd2a67912a59febed4ad (patch) | |
| tree | a09802cd317c19636ac997dec7060c942066ded9 /src/main/java/gregtech/api/metatileentity | |
| parent | ebd2d13d7a8b62a0db2b05c0fd2b7ffa32bb173a (diff) | |
| parent | d50682ff7f722bc7bc1b6ca8dddf21f7a36492ef (diff) | |
| download | GT5-Unofficial-4fbd38eb0b835d640c8ebd2a67912a59febed4ad.tar.gz GT5-Unofficial-4fbd38eb0b835d640c8ebd2a67912a59febed4ad.tar.bz2 GT5-Unofficial-4fbd38eb0b835d640c8ebd2a67912a59febed4ad.zip | |
Merge pull request #1129 from Antifluxfield/PlayerDetector-fix
Player detector fix
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 336c9234fc..e5fba09a82 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -48,6 +48,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE private int oX = 0, oY = 0, oZ = 0, mTimeStatisticsIndex = 0; private short mID = 0; private long mTickTimer = 0; + private String mOwnerName = ""; //Currently only used by PlayerDetector public BaseMetaPipeEntity() { } @@ -69,6 +70,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE aNBT.setByte("mColor", mColor); aNBT.setByte("mStrongRedstone", mStrongRedstone); aNBT.setBoolean("mWorks", !mWorks); + aNBT.setString("mOwnerName", mOwnerName); } catch (Throwable e) { GT_Log.err.println("Encountered CRITICAL ERROR while saving MetaTileEntity, the Chunk whould've been corrupted by now, but I prevented that. Please report immidietly to GregTech Intergalactical!!!"); e.printStackTrace(GT_Log.err); @@ -122,6 +124,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE mColor = aNBT.getByte("mColor"); mStrongRedstone = aNBT.getByte("mStrongRedstone"); mWorks = !aNBT.getBoolean("mWorks"); + mOwnerName = aNBT.getString("mOwnerName"); if (mCoverData.length != 6) mCoverData = new int[]{0, 0, 0, 0, 0, 0}; if (mCoverSides.length != 6) mCoverSides = new int[]{0, 0, 0, 0, 0, 0}; @@ -1101,12 +1104,14 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE @Override public String getOwnerName() { - return "Player"; + if (GT_Utility.isStringInvalid(mOwnerName)) return "Player"; + return mOwnerName; } @Override public String setOwnerName(String aName) { - return "Player"; + if (GT_Utility.isStringInvalid(aName)) return mOwnerName = "Player"; + return mOwnerName = aName; } @Override @@ -1312,4 +1317,4 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider) { mMetaTileEntity.onEntityCollidedWithBlock(aWorld, aX, aY, aZ, collider); } -}
\ No newline at end of file +} |