fixed armor stands blocking attacks in bacon brawl

This commit is contained in:
Cheese 2015-04-01 17:49:49 +11:00
parent 8bd883cb26
commit 24ba42cb16
3 changed files with 7 additions and 7 deletions

View File

@ -58,7 +58,7 @@ public class KitMamaPig extends Kit
pig.setBaby();
pig.setAgeLock(true);
pig.setCustomName(C.cYellow + player.getName());
pig.setCustomNameVisible(true);
pig.setCustomNameVisible(false);
Manager.GetGame().CreatureAllowOverride = false;
player.setPassenger(pig);
@ -78,15 +78,15 @@ public class KitMamaPig extends Kit
{
if (event.IsCancelled())
return;
if (!(event.GetDamageeEntity() instanceof Pig))
return;
Pig pig = (Pig)event.GetDamageeEntity();
if (pig.getVehicle() == null || !(pig.getPassenger() instanceof LivingEntity))
return;
event.setDamagee((LivingEntity)pig.getVehicle());
event.setDamagee((LivingEntity)pig.getVehicle());
}
}

View File

@ -43,7 +43,7 @@ public class KitPig extends Kit
//Disguise
DisguisePig disguise = new DisguisePig(player);
disguise.setName(C.cYellow + player.getName());
disguise.setCustomNameVisible(true);
disguise.setCustomNameVisible(false);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -50,7 +50,7 @@ public class KitSheepPig extends Kit
//Disguise
DisguiseSheep disguise = new DisguiseSheep(player);
disguise.setName(C.cYellow + player.getName());
disguise.setCustomNameVisible(true);
disguise.setCustomNameVisible(false);
disguise.setColor(DyeColor.PINK);
Manager.GetDisguise().disguise(disguise);
}