tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed debugBlock registering tileEntities

Browse source
This commit is contained in:
DarkGuardsman 2013-09-06 00:54:06 -04:00
parent d048d92da4
commit 113706820b
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dark/core/common/debug/BlockDebug.java
View file

@ -104,7 +104,7 @@ public class BlockDebug extends BlockMachine implements IExtraObjectInfo
{
for (DebugBlocks block : DebugBlocks.values())
{
if (block.enabled)
if (block.enabled && block.clazz != null && block.name != null)
{
list.add(new Pair<String, Class<? extends TileEntity>>(block.name, block.clazz));
}
@ -157,6 +157,7 @@ public class BlockDebug extends BlockMachine implements IExtraObjectInfo
private DebugBlocks(String name, Class<? extends TileEntity> clazz)
{
this.name = name;
this.clazz = clazz;
}
private DebugBlocks(String name, Class<? extends TileEntity> clazz, String texture)

4
src/dark/core/prefab/helpers/Pair.java
View file

@ -24,6 +24,10 @@ public class Pair<L, R>
@Override
public int hashCode()
{
if(left == null || right == null)
{
super.hashCode();
}
return left.hashCode() ^ right.hashCode();
}