Skip to content

Commit

Permalink
Excessive formatting
Browse files Browse the repository at this point in the history 
Oh my god.
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Sep 8, 2013
1 parent 2854933 commit ef2c249
Show file tree
Hide file tree
Showing 162 changed files with 1,845 additions and 1,845 deletions.
46 changes: 23 additions & 23 deletions src/main/java/net/aufdemrand/denizen/CommandHandler.java
View file
Expand Up @@ -40,7 +40,7 @@ public CommandHandler(Citizens plugin) {
this.plugin = plugin;
}


/**
* <p>Controls a NPCs Pushable Trait. When a NPC is 'pushable', the NPC
* will move out of the way when colliding with another LivingEntity.</p>
Expand Down Expand Up @@ -201,7 +201,7 @@ public void assignment(CommandContext args, CommandSender sender, NPC npc) throw

if (args.hasValueFlag("set")) {
String script = args.getFlag("set").replace("\"", "");

if (trait.setAssignment(script, dPlayer.mirrorBukkitPlayer(player)))
if (trait.hasAssignment())
Messaging.send(sender, ChatColor.YELLOW + npc.getName() + "'s assignment is now: '" + trait.getAssignment().getName() + "'.");
Expand Down Expand Up @@ -355,7 +355,7 @@ public void sitting(CommandContext args, CommandSender sender, NPC npc) throws C
Messaging.send(sender, ChatColor.RED + npc.getName() + " needs to be a Player type NPC to sit!");
return;
}

if (!npc.hasTrait(SittingTrait.class)) npc.addTrait(SittingTrait.class);
SittingTrait trait = npc.getTrait(SittingTrait.class);

Expand Down Expand Up @@ -390,7 +390,7 @@ public void sitting(CommandContext args, CommandSender sender, NPC npc) throws C
min = 1, max = 3, permission = "npc.stand")
@Requirements(selected = true, ownership = true)
public void standing(CommandContext args, CommandSender sender, NPC npc) throws CommandException {

if (npc.hasTrait(SittingTrait.class)) {
SittingTrait trait = npc.getTrait(SittingTrait.class);
if (!trait.isSitting()) {
Expand All @@ -410,9 +410,9 @@ public void standing(CommandContext args, CommandSender sender, NPC npc) throws
trait.stand();
npc.removeTrait(SneakingTrait.class);
}





}

/*
Expand Down Expand Up @@ -486,19 +486,19 @@ public void startFishing(CommandContext args, CommandSender sender, NPC npc) thr
Messaging.send(sender, ChatColor.RED + npc.getName() + " is already fishing!");
return;
}

if (args.hasFlag('c')) {
trait.startFishing(args.getSenderTargetBlockLocation());
}

if (args.hasFlag('f')) {
trait.setCatchFish(true);
}

if (args.hasValueFlag("percent")) {
trait.setCatchPercent(args.getFlagInteger("percent"));
}

if (args.hasValueFlag("location")) {
String[] argsArray = args.getFlag("location").split(",");
if (argsArray.length != 4) {
Expand Down Expand Up @@ -536,7 +536,7 @@ public void stopFishing(CommandContext args, CommandSender sender, NPC npc) thro
trait.stopFishing();
npc.removeTrait(FishingTrait.class);
}

/*
* Effect
*/
Expand All @@ -547,22 +547,22 @@ public void stopFishing(CommandContext args, CommandSender sender, NPC npc) thro
@Requirements(selected = true, ownership = true)
public void playEffect(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
if (!npc.hasTrait(ParticlesTrait.class)) npc.addTrait(ParticlesTrait.class);
ParticlesTrait trait = npc.getTrait(ParticlesTrait.class);
ParticlesTrait trait = npc.getTrait(ParticlesTrait.class);

if (args.hasValueFlag("delay")) {
trait.setWait(args.getFlagInteger("delay"));
}

if (args.hasFlag('d')) {
trait.setDense(true);
}

if (args.hasValueFlag("play")) {
String name = args.getFlag("play");
if (!npc.hasTrait(ParticlesTrait.class)) npc.addTrait(ParticlesTrait.class);

if (name.equalsIgnoreCase("none")) {
trait.setEffect("NONE");
trait.setEffect("NONE");
} else if (name.equalsIgnoreCase("flame")) {
trait.setEffect("FLAME");
} else if (name.equalsIgnoreCase("ender")) {
Expand All @@ -578,11 +578,11 @@ public void playEffect(CommandContext args, CommandSender sender, NPC npc) throw
} else if (name.equalsIgnoreCase("explosion")) {
trait.setEffect("EXPLOSION");
} else Messaging.send(sender, ChatColor.RED + "Not a valid effect name!");

} else Messaging.send(sender, ChatColor.RED + "Please specify an effect name!");

}

/*
* Sneak
*/
Expand All @@ -596,7 +596,7 @@ public void sneaking(CommandContext args, CommandSender sender, NPC npc) throws
Messaging.send(sender, ChatColor.RED + npc.getName() + " needs to be a Player type NPC to sneak!");
return;
}

if (!npc.hasTrait(SneakingTrait.class)) npc.addTrait(SneakingTrait.class);
SneakingTrait trait = npc.getTrait(SneakingTrait.class);

Expand Down Expand Up @@ -980,11 +980,11 @@ public void text(CommandContext args, CommandSender sender, NPC npc) throws Comm
// before that, so it needs to be high
min = 2, max = 20, permission = "notable.basic")
public void addnotable(CommandContext args, CommandSender sender, NPC npc) throws CommandException {

new dLocation(((Player) sender).getLocation()).rememberAs(args.getString(1));
Messaging.send(sender, "Created new notable called " + (args.getString(1)));
}

@Command(
aliases = { "notable" }, usage = "list",
desc = "Lists all notables", modifiers = { "list" },
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/aufdemrand/denizen/Denizen.java
View file
Expand Up @@ -98,7 +98,7 @@ public TriggerRegistry getTriggerRegistry() {
return triggerRegistry;
}


/*
* Denizen Managers
*/
Expand Down Expand Up @@ -139,7 +139,7 @@ public void onEnable() {
} else startedSuccessful = true;

versionTag = this.getDescription().getVersion();

// Startup procedure
dB.echoDebug(DebugElement.Footer);
dB.echoDebug(ChatColor.YELLOW + " _/_ _ ._ _ _ ");
Expand Down Expand Up @@ -177,7 +177,7 @@ public void onEnable() {

// Create the command script handler for listener
WorldScriptHelper ws_helper = new WorldScriptHelper();

ItemScriptHelper is_helper = new ItemScriptHelper();

// Register traits
Expand Down

0 comments on commit ef2c249

Please sign in to comment.