Merge master

This commit is contained in:
Vincent Lee committed 2019-12-22 18:56:24 -06:00
commit 468d2ec253
7 files changed
+79 -4

No files matched your search

@@ -203,7 +203,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy {
setDelay(cmp.getInt(TAG_DELAY));
setRotation(cmp.getFloat(TAG_ROTATION));
}
public boolean isCharging() {
return dataManager.get(CHARGING);
}
@@ -53,7 +53,9 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem {
private void onEntityDamaged(LivingHurtEvent event) {
if(event.getSource().getImmediateSource() instanceof PlayerEntity
&& event.getEntityLiving() instanceof MobEntity
&& !event.getEntityLiving().world.isRemote && Math.random() < 0.6F) {
&& !event.getEntityLiving().world.isRemote
&& event.getEntityLiving().isNonBoss()
&& Math.random() < 0.6F) {
Runnable lambda = () -> {
MobEntity target = (MobEntity) event.getEntityLiving();
PlayerEntity player = (PlayerEntity) event.getSource().getImmediateSource();