Skip to content

Commit

Permalink
Fix build.
Browse files Browse the repository at this point in the history
  • Loading branch information
@aufdemrand
aufdemrand committed Jun 10, 2013
1 parent c4c08f4 commit 37593c9
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 38 deletions.
6 changes: 3 additions & 3 deletions src/main/java/net/aufdemrand/denizen/listeners/core/TravelListenerInstance.java
View file
Expand Up @@ -90,9 +90,9 @@ public void onBuild(List<String> args) {
dB.echoDebug("...set TYPE to: " + aH.getStringFrom(arg));
} catch (Exception e) {e.printStackTrace();}
} else if (aH.matchesValueArg(TARGET_ARG, arg, ArgumentType.LivingEntity)) {
if ((CitizensAPI.getNPCRegistry().getNPC(aH.getLivingEntityFrom(arg)) != null &&
CitizensAPI.getNPCRegistry().isNPC(aH.getLivingEntityFrom(arg)))){
target = CitizensAPI.getNPCRegistry().getNPC(aH.getLivingEntityFrom(arg));
if ((CitizensAPI.getNPCRegistry().getNPC(aH.getEntityFrom(arg).getBukkitEntity()) != null &&
CitizensAPI.getNPCRegistry().isNPC(aH.getEntityFrom(arg).getBukkitEntity()))){
target = CitizensAPI.getNPCRegistry().getNPC(aH.getEntityFrom(arg).getBukkitEntity());
dB.echoDebug("...NPC set to: " + target.getId());
}
}
Expand Down
29 changes: 6 additions & 23 deletions src/main/java/net/aufdemrand/denizen/objects/aH.java
View file
Expand Up @@ -344,42 +344,35 @@ public static boolean matchesValueArg(String names, String string_arg, ArgumentT
switch (type) {
case Word:
return wordPrimitive.matcher(string_arg).matches();
break;

case Integer:
return integerPrimitive.matcher(string_arg).matches();
break;

case Double:
return doublePrimitive.matcher(string_arg).matches();
break;

case Float:
return floatPrimitive.matcher(string_arg).matches();
break;

case Boolean:
return booleanPrimitive.matcher(string_arg).matches();
break;

case Location:
return dLocation.matches(string_arg);

case Script:
return dScript.matches(string_arg);
// return dScript.matches(string_arg);
return true;

case Item:
return dItem.matches(string_arg);

case LivingEntity:
return dEntity.matches(string_arg);
break;

case Duration:
return Duration.matches(string_arg);

default:
return true;
}

dB.echoError("While parsing '" + string_arg + "', Denizen has run into a problem. While the " +
Expand Down Expand Up @@ -523,29 +516,19 @@ public static Map<String, String> getContextFrom(String arg) {
}

public static boolean matchesLocation(String arg) {
Matcher m = locationPattern.matcher(arg);
if (m.matches())
if (arg.length() > 8 && arg.toUpperCase().startsWith("LOCATION:"))
return true;
else if (arg.toUpperCase().startsWith("location:"))
dB.echoError("While parsing '" + arg + "', Denizen has run into a problem. While the " +
"prefix is correct, the value is not valid. Perhaps a replaceable Tag has failed " +
"to fill in a valid location?");
return false;
}

public static boolean matchesQuantity(String arg) {
Matcher m = matchesQuantityPtrn.matcher(arg);
if (m.matches()) return true;
else if (arg.toUpperCase().startsWith("qty:"))
dB.echoError("While parsing '" + arg + "', Denizen has run into a problem. While the " +
"prefix is correct, the value is not valid. 'QTY' requires a an integer value. " +
"Perhaps a replaceable Tag has failed to fill in a valid value?");
if (arg.length() > 4 && arg.toUpperCase().startsWith("QTY:"))
return true;
return false;
}

public static boolean matchesQueue(String arg) {
Matcher m = matchesQueuePtrn.matcher(arg);
if (m.matches())
if (arg.length() > 6 && arg.toUpperCase().startsWith("QUEUE:"))
return true;
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/aufdemrand/denizen/objects/dEntity.java
View file
Expand Up @@ -113,7 +113,7 @@ public static dEntity valueOf(String string) {

// Player entity
else if (entityGroupUpper.startsWith("P@")) {
LivingEntity returnable = aH.getPlayerFrom(m.group(3));
LivingEntity returnable = aH.getPlayerFrom(m.group(3)).getPlayerEntity();

if (returnable != null) return new dEntity(returnable);
else dB.echoError("Invalid Player! '" + entityGroup
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/aufdemrand/denizen/objects/dList.java
View file
Expand Up @@ -43,7 +43,7 @@ public static dList valueOf(String string) {
return new dList(flag_manager.getPlayerFlag(m.group(3), m.group(4)));

} else if (m.group(2).toLowerCase().startsWith("n@")) {
if (FlagManager.npcHasFlag(aH.getdNPCFrom(m.group(3)), m.group(4)))
if (FlagManager.npcHasFlag(aH.getNPCFrom(m.group(3)), m.group(4)))
return new dList(flag_manager.getNPCFlag(Integer.valueOf(m.group(3)), m.group(4)));
}

Expand Down
17 changes: 15 additions & 2 deletions src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
View file
Expand Up @@ -41,7 +41,13 @@ public static dPlayer valueOf(String string) {
////////
// Match player name

OfflinePlayer returnable = aH.getOfflinePlayerFrom(string);
OfflinePlayer returnable = null;

for (OfflinePlayer player : Bukkit.getOfflinePlayers())
if (player.getName().equalsIgnoreCase(string)) {
returnable = player;
break;
}

if (returnable != null) {
if (players.containsKey(returnable.getName())) return players.get(returnable.getName());
Expand All @@ -59,7 +65,14 @@ public static boolean matches(String arg) {

arg = arg.replace("p@", "");

OfflinePlayer returnable = aH.getOfflinePlayerFrom(arg);
OfflinePlayer returnable = null;

for (OfflinePlayer player : Bukkit.getOfflinePlayers())
if (player.getName().equalsIgnoreCase(arg)) {
returnable = player;
break;
}

if (returnable != null) return true;

return false;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/entity/CastCommand.java
View file
Expand Up @@ -102,8 +102,8 @@ else if (aH.matchesValueArg("TARGETS, TARGET", arg, ArgumentType.String)) {
else targets.add(scriptEntry.getNPC().getEntity());

// If a saved LivingEntity
} else if (aH.getLivingEntityFrom(t) != null) {
targets.add(aH.getLivingEntityFrom(t));
} else if (aH.getEntityFrom(t) != null) {
targets.add(aH.getEntityFrom(t).getBukkitEntity());

// If nothing could be made of the object
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/aufdemrand/denizen/scripts/commands/entity/ShootCommand.java
View file
Expand Up @@ -55,7 +55,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException

for (String arg : scriptEntry.getArguments()) {
if (aH.matchesEntityType(arg)) {
entityType = aH.getEntityFrom(arg);
entityType = aH.getEntityTypeFrom(arg);
dB.echoDebug("...entity set to '%s'.", arg);

} else if (aH.matchesLocation(arg)) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/aufdemrand/denizen/scripts/commands/entity/TeleportCommand.java
View file
Expand Up @@ -96,7 +96,7 @@ else if (aH.matchesValueArg("TARGETS, TARGET", arg, ArgumentType.Custom)) {
teleportNPCs.add(CitizensAPI.getNPCRegistry().getNPC(entity));
continue;
} else if (entity instanceof Player) {
teleportEntities.add(aH.getPlayerFrom(target));
teleportEntities.add(aH.getPlayerFrom(target).getPlayerEntity());
continue;
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/player/ChatCommand.java
View file
Expand Up @@ -68,8 +68,8 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
else {
// Iterate through targets, make sure target is LivingEntity
for (String target : aH.getListFrom(arg)) {
if (aH.getLivingEntityFrom(target) != null) {
context.addRecipient(aH.getLivingEntityFrom(target));
if (aH.getEntityFrom(target) != null) {
context.addRecipient(aH.getEntityFrom(target).getBukkitEntity());
} else
dB.echoError("Invalid TARGET: '%s'", target);
}
Expand All @@ -78,8 +78,8 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException

} else if (aH.matchesValueArg("TALKER", arg, ArgumentType.LivingEntity)) {
String talker = aH.getStringFrom(arg);
if (talker.startsWith("NPC.") && aH.getLivingEntityFrom(talker) != null) {
context.setTalker(aH.getLivingEntityFrom(talker));
if (aH.getNPCFrom(talker) != null) {
context.setTalker(aH.getEntityFrom(talker).getBukkitEntity());
} else
//
// TODO: add hooking into Converse to handle player talking
Expand Down

0 comments on commit 37593c9

Please sign in to comment.