JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use team.getDyeColor to color wolf collars

Browse Source
This commit is contained in:
Spencer 2017-12-28 18:36:59 -05:00 committed by Alexander Meech
parent d47eb2367f
commit 496d515972
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolfPet.java
View File

@ -107,9 +107,12 @@ public class PerkWolfPet extends Perk
GameTeam team = Manager.GetGame().GetTeam(cur); GameTeam team = Manager.GetGame().GetTeam(cur);
if (team != null) { if (team != null)
wolf.setCollarColor(DyeColor.getByColor(team.GetColorBase())); {
} else { wolf.setCollarColor(team.getDyeColor());
}
else
{
wolf.setCollarColor(DyeColor.GREEN); wolf.setCollarColor(DyeColor.GREEN);
} }
@ -129,7 +132,12 @@ public class PerkWolfPet extends Perk
@EventHandler @EventHandler
public void cubTargetCancel(EntityTargetEvent event) public void cubTargetCancel(EntityTargetEvent event)
{ {
if (_petMap.containsKey(event.getTarget()) && _petMap.get(event.getTarget()).contains(event.getEntity()) if (!(event.getTarget() instanceof Player) || !(event.getEntity() instanceof Wolf))
{
return;
}
if (_petMap.containsKey(event.getTarget()) && _petMap.get(event.getTarget()).contains(event.getEntity()))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@ -139,10 +147,11 @@ public class PerkWolfPet extends Perk
{ {
for (Wolf wolf : _petMap.get(owner)) for (Wolf wolf : _petMap.get(owner))
{ {
if (event.getEntity().getEntityId() == wolf.getEntityId()) if (event.getEntity().equals(wolf))
{ {
if (!Manager.canHurt(owner, (Player) event.getTarget())) { if (!Manager.canHurt(owner, (Player) event.getTarget())) {
event.setCancelled(true); event.setCancelled(true);
return;
} }
} }
} }