Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1129 from Antifluxfield/PlayerDetector-fix

Browse source 
Player detector fix
This commit is contained in:
Blood-Asp 2017-07-01 17:35:30 +02:00 committed by GitHub
commit 4fbd38eb0b
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
View file

@ -48,6 +48,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
private int oX = 0, oY = 0, oZ = 0, mTimeStatisticsIndex = 0; private int oX = 0, oY = 0, oZ = 0, mTimeStatisticsIndex = 0;
private short mID = 0; private short mID = 0;
private long mTickTimer = 0; private long mTickTimer = 0;
private String mOwnerName = ""; //Currently only used by PlayerDetector
public BaseMetaPipeEntity() { public BaseMetaPipeEntity() {
} }
@ -69,6 +70,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
aNBT.setByte("mColor", mColor); aNBT.setByte("mColor", mColor);
aNBT.setByte("mStrongRedstone", mStrongRedstone); aNBT.setByte("mStrongRedstone", mStrongRedstone);
aNBT.setBoolean("mWorks", !mWorks); aNBT.setBoolean("mWorks", !mWorks);
aNBT.setString("mOwnerName", mOwnerName);
} catch (Throwable e) { } 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!!!"); 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); e.printStackTrace(GT_Log.err);
@ -122,6 +124,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
mColor = aNBT.getByte("mColor"); mColor = aNBT.getByte("mColor");
mStrongRedstone = aNBT.getByte("mStrongRedstone"); mStrongRedstone = aNBT.getByte("mStrongRedstone");
mWorks = !aNBT.getBoolean("mWorks"); mWorks = !aNBT.getBoolean("mWorks");
mOwnerName = aNBT.getString("mOwnerName");
if (mCoverData.length != 6) mCoverData = new int[]{0, 0, 0, 0, 0, 0}; 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}; 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 @Override
public String getOwnerName() { public String getOwnerName() {
return "Player"; if (GT_Utility.isStringInvalid(mOwnerName)) return "Player";
return mOwnerName;
} }
@Override @Override
public String setOwnerName(String aName) { public String setOwnerName(String aName) {
return "Player"; if (GT_Utility.isStringInvalid(aName)) return mOwnerName = "Player";
return mOwnerName = aName;
} }
@Override @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) { public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider) {
mMetaTileEntity.onEntityCollidedWithBlock(aWorld, aX, aY, aZ, collider); mMetaTileEntity.onEntityCollidedWithBlock(aWorld, aX, aY, aZ, collider);
} }
} }

4
src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
View file

@ -57,8 +57,8 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
if(aCoverVariable <0){aCoverVariable = 2;} if(aCoverVariable <0){aCoverVariable = 2;}
switch(aCoverVariable) { switch(aCoverVariable) {
case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("068", "Emit if any Player is close")); break; case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("068", "Emit if any Player is close")); break;
case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("069", "Emit if other Player is close")); break; case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("070", "Emit if you are close")); break;
case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("070", "Emit if you are close")); break; case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("069", "Emit if other Player is close")); break;
} }
return aCoverVariable; return aCoverVariable;
} }