aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorkuba6000 <kuba.123123.6000@gmail.com>2023-01-19 08:57:23 +0100
committerkuba6000 <kuba.123123.6000@gmail.com>2023-01-19 08:57:23 +0100
commitc927b4119bf005ee8c8fe078b32ad83126ef3dd1 (patch)
treefa18ad71275b31b95757a76ed70eb8b3ed83eb55 /src/main/java
parent009b4719fe375b25b77145197dc2dc29dba6be55 (diff)
parente08b464f962c44571e1ee8372daf6de9721f0285 (diff)
downloadGT5-Unofficial-c927b4119bf005ee8c8fe078b32ad83126ef3dd1.tar.gz
GT5-Unofficial-c927b4119bf005ee8c8fe078b32ad83126ef3dd1.tar.bz2
GT5-Unofficial-c927b4119bf005ee8c8fe078b32ad83126ef3dd1.zip
Merge branch 'master' of https://github.com/GTNewHorizons/KubaTech
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/kubatech/loaders/item/items/TeaCollection.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/kubatech/loaders/item/items/TeaCollection.java b/src/main/java/kubatech/loaders/item/items/TeaCollection.java
index 50d73291f0..8440576fe2 100644
--- a/src/main/java/kubatech/loaders/item/items/TeaCollection.java
+++ b/src/main/java/kubatech/loaders/item/items/TeaCollection.java
@@ -142,9 +142,12 @@ public class TeaCollection extends ItemProxy {
@Override
public String getDisplayName(ItemStack stack) {
- if (!ModUtils.isClientSided) return super.getDisplayName(stack);
- if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName()))
+ if (!ModUtils.isClientSided || Minecraft.getMinecraft().thePlayer == null) {
return super.getDisplayName(stack);
+ }
+ if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName())) {
+ return super.getDisplayName(stack);
+ }
return EnumChatFormatting.GOLD + "" + EnumChatFormatting.BOLD + "" + EnumChatFormatting.ITALIC + "???????";
}