Skip to content

Commit

Permalink
Fix hanging in matchesEnt
Browse files Browse the repository at this point in the history
For his own entertainment, Talamar simply doesn't test his own code at
all, he just commits freely to watch the chaos...
  • Loading branch information
mcmonkey4eva committed Nov 18, 2015
1 parent 7130a74 commit 86a8674
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/main/java/net/aufdemrand/denizen/objects/dEntity.java
Expand Up @@ -1249,6 +1249,9 @@ public boolean matchesEntity(String ent) {
if (ent.equalsIgnoreCase("projectile")) {
return entity instanceof Projectile;
}
if (ent.equalsIgnoreCase("hanging")) {
return entity instanceof Hanging;
}
if (ent.equalsIgnoreCase(getName())) {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
Expand Up @@ -1533,7 +1533,7 @@ else if (isOnline())
/////////////////

// <--[tag]
// @attribute <p@player.compass.target>
// @attribute <p@player.compass_target>
// @returns dLocation
// @description
// returns the location of the player's compass target.
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/aufdemrand/denizen/tags/core/TextTags.java
Expand Up @@ -23,6 +23,8 @@ public void foreignCharacterTags(ReplaceableTagEvent event) {
if (!event.getName().startsWith("&")) return;
Attribute attribute = event.getAttributes();

// TODO: Handle case-sensitivity stuff better here!

// <--[tag]
// @attribute <&auml>
// @returns Element
Expand Down Expand Up @@ -51,7 +53,7 @@ else if (event.getName().equals("&ouml"))
event.setReplaced(new Element("ö").getAttribute(attribute.fulfill(1)));

// <--[tag]
// @attribute <&Iuml>
// @attribute <&Ouml>
// @returns Element
// @description
// Returns a capital umlaut-O symbol: Ö
Expand Down

0 comments on commit 86a8674

Please sign in to comment.