aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCromaMclos <github@zorben.com>2024-05-12 11:31:43 -0700
committerGitHub <noreply@github.com>2024-05-12 20:31:43 +0200
commit569e4dc39cd031222c71639f5d3505d4ac7663f1 (patch)
treeda0510168ecb5cb90ae2900425f7bc0e2a319911
parent92159e690e0045bc8270c6c2b51f7fdbee8ecc24 (diff)
downloadGT5-Unofficial-569e4dc39cd031222c71639f5d3505d4ac7663f1.tar.gz
GT5-Unofficial-569e4dc39cd031222c71639f5d3505d4ac7663f1.tar.bz2
GT5-Unofficial-569e4dc39cd031222c71639f5d3505d4ac7663f1.zip
Update GT_MetaTileEntity_IndustrialApiary.java (#2596)
The Apimancer's Drainer uses GT_MetaTileEntity_IndustrialApiary.getUsedQueen to retrieve the queen currently being processed by the Industrial Apiary. getUsedQueen is annotated with @SideOnly(Side.CLIENT) which only allows this function to be called from singleplayer. This function is not available when called from server-side and leads to the crash detailed in this issue. As far as I can tell, this function has no reason to be singleplayer / client-side only. This seems to be an artifact from when this function was imported over 2 years ago. Testing this change in our world prevents the crash and allows the Apimancer's Drainer to work as expected with the Industrial Apiary. Resolves GTNewHorizons/GT-New-Horizons-Modpack#16222
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
index 0a3dd02a66..50f544334c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
@@ -69,8 +69,6 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
import com.mojang.authlib.GameProfile;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
@@ -743,7 +741,6 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
if (aIndex > drone && aIndex < getOutputSlot()) updateModifiers();
}
- @SideOnly(Side.CLIENT)
public ItemStack getUsedQueen() {
return usedQueen;
}