Skip to content

Commit

Permalink
Change handful of remaining tabs into spaces.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidcernat committed Aug 17, 2013
1 parent 3c0229b commit b55f68a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
Expand Up @@ -84,7 +84,7 @@ else if (comparable instanceof dList) {
if (dList.matches(arg))
comparedto = dList.valueOf(arg);
else
comparedto = arg;
comparedto = arg;
}

else comparedto = arg;
Expand Down
40 changes: 20 additions & 20 deletions src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java
Expand Up @@ -32,7 +32,7 @@ public NPCTags(Denizen denizen) {

@EventHandler
public void npcTags(ReplaceableTagEvent event) {
if (!event.matches("npc") || event.replaced()) return;

// Build a new attribute out of the raw_tag supplied in the script to be fulfilled
Expand Down Expand Up @@ -96,25 +96,25 @@ public void navBegin(NavigationBeginEvent event) {
npc.action("begin navigation", null);

if (event.getNPC().getNavigator().getTargetType() == TargetType.ENTITY) {
LivingEntity entity = event.getNPC().getNavigator().getEntityTarget().getTarget();
// If the NPC has an entity target, is aggressive towards it
// and that entity is not dead, trigger "on attack" command
if (event.getNPC().getNavigator().getEntityTarget().isAggressive()
&& !entity.isDead())
{
dPlayer player = null;
// Check if the entity attacked by this NPC is a player
if (entity instanceof Player)
player = dPlayer.mirrorBukkitPlayer((Player) entity);
npc.action("attack", player);
npc.action("attack on "
+ entity.getType().toString(), player);
}
previousLocations.put(event.getNPC().getId(), npc.getLocation());
LivingEntity entity = event.getNPC().getNavigator().getEntityTarget().getTarget();
// If the NPC has an entity target, is aggressive towards it
// and that entity is not dead, trigger "on attack" command
if (event.getNPC().getNavigator().getEntityTarget().isAggressive()
&& !entity.isDead()) {
dPlayer player = null;
// Check if the entity attacked by this NPC is a player
if (entity instanceof Player)
player = dPlayer.mirrorBukkitPlayer((Player) entity);
npc.action("attack", player);
npc.action("attack on "
+ entity.getType().toString(), player);
}
previousLocations.put(event.getNPC().getId(), npc.getLocation());
}
}

Expand Down

0 comments on commit b55f68a

Please sign in to comment.