Merge branch 'master' into experimental

This commit is contained in:
Bernhard Bonigl committed 2014-11-30 14:04:39 +01:00
commit 076b66be10
11 files changed
+583 -610

No files matched your search

@@ -36,12 +36,6 @@ public class TinkerArmorEvents
if (event.entityLiving instanceof IBossDisplayData)
{
if (event.entityLiving instanceof BlueSlime)
{
BlueSlime slime = (BlueSlime) event.entityLiving;
if (slime.getSlimeSize() < 8)
return;
}
String entityName = event.entityLiving.getClass().getSimpleName().toLowerCase();
if (entityName.contains("entitynpc") || entityName.contains("entitycustomnpc"))
return;