Fixes sidedness issues when starting up the server.

This commit is contained in:
Sebastian Hartte
2016-11-04 21:01:25 +01:00
parent 84bc00fa20
commit 7f02562e0c
2 changed files with 15 additions and 2 deletions
@@ -283,7 +283,7 @@ public enum PartType
{ {
// Only load models if the part is enabled, otherwise we also run into class-loading issues while // Only load models if the part is enabled, otherwise we also run into class-loading issues while
// scanning for annotations // scanning for annotations
if( Platform.isClient() ) if( Platform.isClientInstall() )
{ {
this.itemModels = createItemModels( itemModel ); this.itemModels = createItemModels( itemModel );
} }
@@ -298,7 +298,10 @@ public enum PartType
} }
else else
{ {
this.itemModels = Collections.emptyList(); if( Platform.isClientInstall() )
{
this.itemModels = Collections.emptyList();
}
this.models = Collections.emptySet(); this.models = Collections.emptySet();
} }
} }
+10
View File
@@ -150,6 +150,8 @@ public class Platform
public static final int DEF_OFFSET = 16; public static final int DEF_OFFSET = 16;
private static final boolean CLIENT_INSTALL = FMLCommonHandler.instance().getSide().isClient();
/* /*
* random source, use it for item drop locations... * random source, use it for item drop locations...
*/ */
@@ -402,6 +404,14 @@ public class Platform
return FMLCommonHandler.instance().getEffectiveSide().isClient(); return FMLCommonHandler.instance().getEffectiveSide().isClient();
} }
/*
* returns true if client classes are available.
*/
public static boolean isClientInstall()
{
return CLIENT_INSTALL;
}
public static boolean hasPermissions( final DimensionalCoord dc, final EntityPlayer player ) public static boolean hasPermissions( final DimensionalCoord dc, final EntityPlayer player )
{ {
return dc.getWorld().canMineBlockBody( player, dc.getPos() ); return dc.getWorld().canMineBlockBody( player, dc.getPos() );