disable 1.11 back compat features that don't work right

Need fixes for compat
DenizenScript · Jul 2, 2017 · a8baf56 · a8baf56
1 parent c1d5052
commit a8baf56
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -962,9 +962,9 @@ public void onDisable() {
         OldEventManager.doEvents(Arrays.asList("shutdown"), new BukkitScriptEntryData(null, null), context);
 
         // Disable the log interceptor... otherwise bad things on /reload
-        if (logInterceptor != null) {
+        /*if (logInterceptor != null) {
             logInterceptor.standardOutput();
-        }
+        }*/
 
         // Save notables
         notableManager.saveNotables();

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -3053,12 +3053,13 @@ else if (split.length > 1) {
         // <p@player.ban_info.created>
         // -->
         if (mechanism.matches("is_banned") && mechanism.requireBoolean()) {
-            if (NMSHandler.getVersion().isAtMost(NMSVersion.v1_11_R1)) {
+            /*if (NMSHandler.getVersion().isAtMost(NMSVersion.v1_11_R1)) {
                 getOfflinePlayer().setBanned(mechanism.getValue().asBoolean());
             }
             else {
                 // TODO
-            }
+            }*/
+            // TODO: !!!
         }
 
         // <--[mechanism]

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptHelper.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptHelper.java
@@ -155,6 +155,7 @@ private static void forceCommand(String name, DenizenCommand command, HelpTopic
     }
 
     private static class IsCommandTopicPredicate implements Predicate<HelpTopic> {
+        public boolean test(HelpTopic topic) { return apply(topic); }
         public boolean apply(HelpTopic topic) {
             return topic.getName().charAt(0) == '/';
         }

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java b/plugin/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java
@@ -1134,12 +1134,12 @@ public static void adjustServer(Mechanism mechanism) {
                 dB.echoError("Console redirection disabled by administrator.");
                 return;
             }
-            if (mechanism.getValue().asBoolean()) {
+            /*if (mechanism.getValue().asBoolean()) {
                 Denizen.logInterceptor.redirectOutput();
             }
             else {
                 Denizen.logInterceptor.standardOutput();
-            }
+            }*/
         }
 
         // <--[mechanism]

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/DenizenCommandSender.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/DenizenCommandSender.java
@@ -2,6 +2,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.conversations.Conversation;
 import org.bukkit.conversations.ConversationAbandonedEvent;
@@ -55,6 +56,11 @@ public String getName() {
         return Bukkit.getConsoleSender().getName();
     }
 
+    @Override
+    public Spigot spigot() {
+        return null; // TODO: ??
+    }
+
     @Override
     public boolean isConversing() {
         return Bukkit.getConsoleSender().isConversing();

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/FakeOfflinePlayer.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/FakeOfflinePlayer.java
@@ -38,9 +38,9 @@ public boolean isBanned() {
     }
 
     // TODO: 1.12 update removed this
-    @Override
+   /* @Override
     public void setBanned(boolean b) {
-    }
+    }*/
 
     @Override
     public boolean isWhitelisted() {

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/debugging/LogInterceptor.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/debugging/LogInterceptor.java
@@ -14,7 +14,6 @@
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.spi.AbstractLogger;
-import org.apache.logging.log4j.spi.AbstractLoggerWrapper;
 import org.bukkit.ChatColor;
 
 import java.io.ByteArrayOutputStream;
@@ -28,6 +27,11 @@
  * Intercepts system.out operations for the sake of blocking messages at request.
  * Disabled by default in config.yml
  */
+
+public class LogInterceptor {
+    // TODO: Re-enable functionality. Cross-version somehow.
+}
+/*
 public class LogInterceptor extends PrintStream {
     boolean redirected = false;
     public PrintStream standardOut;
@@ -114,3 +118,4 @@ public void flush() throws IOException {
         }
     }
 }
+*/