From 989be6fd5ce366e69f44d26273e6fd36646c2237 Mon Sep 17 00:00:00 2001 From: "Alex \"mcmonkey\" Goodwin" Date: Sat, 19 Mar 2022 22:52:45 -0700 Subject: [PATCH] match core commit --- .../denizen/tags/core/ServerTagBase.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java index 0bd10f94e0..d2925faa2c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java +++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java @@ -80,18 +80,19 @@ public ServerTagBase() { public void run(ReplaceableTagEvent event) { serverTag(event); } - }, "server", "global"); + }, "server"); + TagManager.registerStaticTagBaseHandler(ElementTag.class, "global", (attribute) -> { + Deprecations.globalTagName.warn(attribute.context); + return null; + }); } public static final long serverStartTimeMillis = System.currentTimeMillis(); public void serverTag(ReplaceableTagEvent event) { - if (!event.matches("server", "global") || event.replaced()) { + if (!event.matches("server") || event.replaced()) { return; } - if (event.matches("global")) { - Deprecations.globalTagName.warn(event.getScriptEntry()); - } Attribute attribute = event.getAttributes().fulfill(1); if (attribute.startsWith("economy")) {