Skip to content

Commit

Permalink
Merge pull request #514 from mcmonkey4eva/master
Browse files Browse the repository at this point in the history
Add new meta system, "<@link MetaType MetaName>"
  • Loading branch information
aufdemrand committed Nov 7, 2013
2 parents 215ffda + 3550a91 commit d34808e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/objects/Element.java
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public String getAttribute(Attribute attribute) {
// @description
// Takes an operator, and compares the value of the element to the supplied
// element. Returns the outcome of the comparable, either true or false. For
// information on operators, see !lang operator.
// information on operators, see <@link language operator>.
// -->

// <--[tag]
Expand All @@ -213,7 +213,7 @@ public String getAttribute(Attribute attribute) {
// @description
// Takes an operator, and compares the value of the element to the supplied
// element. Returns the outcome of the comparable, either true or false. For
// information on operators, see !lang operator.
// information on operators, see <@link language operator>.
// -->
if (attribute.startsWith("is") && attribute.hasContext(1)
&& (attribute.startsWith("to", 2) || attribute.startsWith("than", 2)) && attribute.hasContext(2)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class Comparable {
// @group Comparables
// @description
// An operator is the type of comparison that a comparable will check. Not all types of
// comparables are compatible with all operators. See '!lang comparable' for more information.
// comparables are compatible with all operators. See <@link language comparable> for more information.
//
// Available Operators include:
// EQUALS (==), MATCHES, OR_MORE (>=), OR_LESS (<=), MORE (>), LESS (<), CONTAINS, and IS_EMPTY.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ public void procedureTag(ReplaceableTagEvent event) {
// @attribute <proc[ProcedureScript].Context[<element>|...]>
// @returns Element
// @description
// Returns the 'determine' result of a procedure script with the given context
// See !tutorial procedure
// Returns the 'determine' result of a procedure script with the given context.
// See <@link example Using Procedure Scripts>.
// -->
// <--[tag]
// @attribute <proc[ProcedureScript]>
// @returns Element
// @description
// Returns the 'determine' result of a procedure script
// See !tutorial procedure
// Returns the 'determine' result of a procedure script.
// See <@link example Using Procedure Scripts>.
// -->
if (!event.matches("proc, pr")) return;

Expand Down

0 comments on commit d34808e

Please sign in to comment.