From 7deae06cdc57c709e201bdf2658b579f38fd8655 Mon Sep 17 00:00:00 2001 From: Jeremy Schroeder Date: Sat, 6 Jul 2013 12:11:08 -0400 Subject: [PATCH] =?UTF-8?q?Change=20some=20worldscript=20contexts=20into?= =?UTF-8?q?=20Elements.=20'On=20=E2=80=A6=20Command'=20?= =?UTF-8?q?=20and=20=20now=20return=20Elements=20for?= =?UTF-8?q?=20use=20with=20the=20new=20tagging=20system.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/aufdemrand/denizen/objects/Element.java | 13 +++++++++---- .../scripts/containers/core/WorldScriptHelper.java | 8 ++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/objects/Element.java b/src/main/java/net/aufdemrand/denizen/objects/Element.java index 5006c72dbb..d7fbafb6aa 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/Element.java +++ b/src/main/java/net/aufdemrand/denizen/objects/Element.java @@ -217,16 +217,21 @@ else if (element.toLowerCase().contains(contains.toLowerCase())) String split_string = (attribute.hasContext(1) ? attribute.getContext(1) : " "); Integer limit = (attribute.hasContext(2) ? attribute.getIntContext(2) : 1); if (split_string.toLowerCase().startsWith("regex:")) - return new dList(Arrays.asList(element.split(split_string.split(":", 2)[1], limit))).getAttribute(attribute.fulfill(1)); + return new dList(Arrays.asList(element.split(split_string.split(":", 2)[1], limit))) + .getAttribute(attribute.fulfill(1)); else - return new dList(Arrays.asList(StringUtils.split(element, split_string, limit))).getAttribute(attribute.fulfill(1)); } + return new dList(Arrays.asList(StringUtils.split(element, split_string, limit))) + .getAttribute(attribute.fulfill(1)); + } if (attribute.startsWith("split")) { String split_string = (attribute.hasContext(1) ? attribute.getContext(1) : " "); if (split_string.toLowerCase().startsWith("regex:")) - return new dList(Arrays.asList(element.split(split_string.split(":", 2)[1]))).getAttribute(attribute.fulfill(1)); + return new dList(Arrays.asList(element.split(split_string.split(":", 2)[1]))) + .getAttribute(attribute.fulfill(1)); else - return new dList(Arrays.asList(StringUtils.split(element, split_string))).getAttribute(attribute.fulfill(1)); + return new dList(Arrays.asList(StringUtils.split(element, split_string))) + .getAttribute(attribute.fulfill(1)); } if (attribute.startsWith("sqrt")) { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java index 5b4d1a45d0..97a916a4b5 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java @@ -836,8 +836,8 @@ public void playerCommandEvent(PlayerCommandPreprocessEvent event) { // Fill context context.put("args", args_list); - context.put("command", command); - context.put("raw_args", (event.getMessage().split(" ").length > 1 ? event.getMessage().split(" ", 2)[1] : "")); + context.put("command", new Element(command)); + context.put("raw_args", new Element((event.getMessage().split(" ").length > 1 ? event.getMessage().split(" ", 2)[1] : ""))); String determination; // Run any event scripts and get the determination. @@ -855,7 +855,7 @@ public void playerCommandEvent(PlayerCommandPreprocessEvent event) { public void playerDeath(PlayerDeathEvent event) { Map context = new HashMap(); - context.put("message", event.getDeathMessage()); + context.put("message", new Element(event.getDeathMessage())); String determination = doEvents(Arrays.asList ("player dies"), @@ -870,7 +870,7 @@ public void playerDeath(PlayerDeathEvent event) { public void playerGameModeChange(PlayerGameModeChangeEvent event) { Map context = new HashMap(); - context.put("gamemode", event.getNewGameMode().name()); + context.put("gamemode", new Element(event.getNewGameMode().name())); String determination = doEvents(Arrays.asList ("player changes gamemode",