Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a bug with the game sometimes crashing when looking at a block with the manual in hand

Browse source 
This should actually fix it.
This commit is contained in:
Ellpeck 2016-07-08 19:08:54 +02:00
parent 41a78d0399
commit a315acc50d
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/ellpeck/actuallyadditions/mod/event/ClientEvents.java
View file

@ -136,9 +136,7 @@ public class ClientEvents{
if(stack != null){ if(stack != null){
if(stack.getItem() instanceof IHudDisplay){ if(stack.getItem() instanceof IHudDisplay){
profiler.startSection("ItemHudDisplay"); profiler.startSection("ItemHudDisplay");
if(minecraft.theWorld != null){
((IHudDisplay)stack.getItem()).displayHud(minecraft, player, stack, posHit, profiler, event.getResolution()); ((IHudDisplay)stack.getItem()).displayHud(minecraft, player, stack, posHit, profiler, event.getResolution());
}
profiler.endSection(); profiler.endSection();
} }
} }
@ -149,9 +147,7 @@ public class ClientEvents{
if(blockHit instanceof IHudDisplay){ if(blockHit instanceof IHudDisplay){
profiler.startSection("BlockHudDisplay"); profiler.startSection("BlockHudDisplay");
if(minecraft.theWorld != null){
((IHudDisplay)blockHit).displayHud(minecraft, player, stack, posHit, profiler, event.getResolution()); ((IHudDisplay)blockHit).displayHud(minecraft, player, stack, posHit, profiler, event.getResolution());
}
profiler.endSection(); profiler.endSection();
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java
View file

@ -98,7 +98,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{
@Override @Override
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, Profiler profiler, ScaledResolution resolution){ public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, Profiler profiler, ScaledResolution resolution){
if(posHit != null){ if(posHit != null && posHit.getBlockPos() != null){
IBlockState state = minecraft.theWorld.getBlockState(posHit.getBlockPos()); IBlockState state = minecraft.theWorld.getBlockState(posHit.getBlockPos());
Block block = state.getBlock(); Block block = state.getBlock();
if(block != null && !block.isAir(minecraft.theWorld.getBlockState(posHit.getBlockPos()), minecraft.theWorld, posHit.getBlockPos())){ if(block != null && !block.isAir(minecraft.theWorld.getBlockState(posHit.getBlockPos()), minecraft.theWorld, posHit.getBlockPos())){