diff options
| author | Martin Robertz <dream-master@gmx.net> | 2020-02-25 18:24:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 18:24:09 +0100 |
| commit | 5680fbc57fedb9c3aec07bdbf6efc67e64832564 (patch) | |
| tree | 087b121f0d40b58914411438574eaf0fe63ed8e0 /src/main/java/gregtech/api/util | |
| parent | 0db0f5bc83a3446b09418f49cee8329a1a6b73fb (diff) | |
| parent | 5c8be4893ee303377629ae7404e5608eb4bd7c37 (diff) | |
| download | GT5-Unofficial-5680fbc57fedb9c3aec07bdbf6efc67e64832564.tar.gz GT5-Unofficial-5680fbc57fedb9c3aec07bdbf6efc67e64832564.tar.bz2 GT5-Unofficial-5680fbc57fedb9c3aec07bdbf6efc67e64832564.zip | |
Merge pull request #247 from Relvl/fix-fakeplayers-uuid
Provide owner's UUID to forge event bus for fake players.
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index fa7bd78c4d..9e0589c2cb 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -95,6 +95,7 @@ public class GT_Utility { public static boolean TE_CHECK = false, BC_CHECK = false, CHECK_ALL = true, RF_CHECK = false;
public static Map<GT_PlayedSound, Integer> sPlayedSoundMap = new /*Concurrent*/HashMap<GT_PlayedSound, Integer>();
private static int sBookCount = 0;
+ public static UUID defaultUuid = null; // maybe default non-null? UUID.fromString("00000000-0000-0000-0000-000000000000");
static {
GregTech_API.sItemStackMappings.add(sFilledContainerToData);
@@ -1974,7 +1975,7 @@ public class GT_Utility { public static FakePlayer getFakePlayer(IGregTechTileEntity aBaseMetaTileEntity) {
if (aBaseMetaTileEntity.getWorld() instanceof WorldServer) {
- return FakePlayerFactory.get((WorldServer) aBaseMetaTileEntity.getWorld(), new GameProfile(null, aBaseMetaTileEntity.getOwnerName()));
+ return FakePlayerFactory.get((WorldServer) aBaseMetaTileEntity.getWorld(), new GameProfile(aBaseMetaTileEntity.getOwnerUuid(), aBaseMetaTileEntity.getOwnerName()));
}
return null;
}
@@ -2189,7 +2190,7 @@ public class GT_Utility { + "Oils: " + (tOils != null ? tOils.length : 0) + "\n\n"
+ "Ores within " + tRadius + " blocks\n\n"
+ "Location is center of orevein\n\n"
- +
"Check NEI to confirm orevein type";
+ + "Check NEI to confirm orevein type";
tNBTList.appendTag(new NBTTagString(tPageText));
if (tOres != null)
|