From d355ec28bb0b9157c0be56ee2e3241f4e0956d8a Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Wed, 19 Feb 2014 23:44:13 +0100 Subject: [PATCH] Added try/catch around NBT dumping client side. --- .../waila/api/impl/MetaDataProvider.java | 20 +++++++++++++------ .../waila/handlers/HUDHandlerEntities.java | 6 +++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/mcp/mobius/waila/api/impl/MetaDataProvider.java b/mcp/mobius/waila/api/impl/MetaDataProvider.java index 57ceb6a..5dd5e57 100644 --- a/mcp/mobius/waila/api/impl/MetaDataProvider.java +++ b/mcp/mobius/waila/api/impl/MetaDataProvider.java @@ -78,9 +78,13 @@ public class MetaDataProvider{ PacketDispatcher.sendPacketToServer(Packet0x01TERequest.create(world, mop, keys)); } else if (accessor.getTileEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) { - NBTTagCompound tag = new NBTTagCompound(); - accessor.getTileEntity().writeToNBT(tag); - accessor.remoteNbt = tag; + try{ + NBTTagCompound tag = new NBTTagCompound(); + accessor.getTileEntity().writeToNBT(tag); + accessor.remoteNbt = tag; + } catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().getName(), null); + } } /* Interface IWailaBlock */ @@ -173,9 +177,13 @@ public class MetaDataProvider{ } else if (accessor.getEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) { - NBTTagCompound tag = new NBTTagCompound(); - accessor.getEntity().writeToNBT(tag); - accessor.remoteNbt = tag; + try{ + NBTTagCompound tag = new NBTTagCompound(); + accessor.getEntity().writeToNBT(tag); + accessor.remoteNbt = tag; + } catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().getName(), null); + } } headEntityProviders.clear(); diff --git a/mcp/mobius/waila/handlers/HUDHandlerEntities.java b/mcp/mobius/waila/handlers/HUDHandlerEntities.java index 1410604..6fb1d6f 100644 --- a/mcp/mobius/waila/handlers/HUDHandlerEntities.java +++ b/mcp/mobius/waila/handlers/HUDHandlerEntities.java @@ -43,10 +43,10 @@ public class HUDHandlerEntities implements IWailaEntityProvider { nhearts = nhearts <= 0 ? 20 : nhearts; float health = ((EntityLivingBase)entity).getHealth() / 2.0f; - float maxhp = ((EntityLivingBase)entity).getMaxHealth() / 2.0f;; + float maxhp = ((EntityLivingBase)entity).getMaxHealth() / 2.0f; - if (maxhp > 40.0f) - currenttip.add(String.format("HP : " + WHITE + "%.0f" + GRAY + " / " + WHITE + "%.0f", health, maxhp)); + if (maxhp > 20.0f) + currenttip.add(String.format("HP : " + WHITE + "%.0f" + GRAY + " / " + WHITE + "%.0f", ((EntityLivingBase)entity).getHealth(), ((EntityLivingBase)entity).getMaxHealth())); else{ for (int i = 0; i < MathHelper.floor_float(health); i++){