build for 1.15.2, and minor cleanup

DenizenScript · Jan 22, 2020 · fe6b042 · fe6b042
1 parent dd61581
commit fe6b042
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 dDiscordBot: Adds a Discord Bot to Denizen!
 -------------------------------------------
 
-
 **Download (Dev builds)**: https://ci.citizensnpcs.co/job/dDiscordBot/
 
 Only works if you know how to operate a Discord bot, of course! https://github.com/reactiflux/discord-irc/wiki/Creating-a-discord-bot-&-getting-a-token

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>
-        <bukkit.version>1.14.4-R0.1-SNAPSHOT</bukkit.version>
+        <bukkit.version>1.15.2-R0.1-SNAPSHOT</bukkit.version>
 		<denizen.version>1.1.2-SNAPSHOT</denizen.version>
     </properties>
 
@@ -37,8 +37,8 @@
     <!-- Dependencies -->
     <dependencies>
         <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
             <version>${bukkit.version}</version>
             <type>jar</type>
             <scope>provided</scope>

diff --git a/src/main/java/com/denizenscript/ddiscordbot/DiscordScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/DiscordScriptEvent.java
@@ -7,7 +7,6 @@
 import com.denizenscript.denizencore.objects.ObjectTag;
 import reactor.core.publisher.Flux;
 
-
 public abstract class DiscordScriptEvent extends ScriptEvent {
 
     public String botID;

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageModifiedScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageModifiedScriptEvent.java
@@ -55,7 +55,6 @@ public MessageUpdateEvent getEvent() {
         return (MessageUpdateEvent) event;
     }
 
-
     @Override
     public boolean couldMatch(ScriptContainer scriptContainer, String s) {
         return CoreUtilities.toLowerCase(s).startsWith("discord message modified");

diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordRoleTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordRoleTag.java
@@ -239,7 +239,10 @@ public String identify() {
         if (bot != null) {
             return "discordrole@" + bot + "," + guild_id + "," + role_id;
         }
-        return "discordrole@" + guild_id + "," + role_id;
+        if (guild_id != 0) {
+            return "discordrole@" + guild_id + "," + role_id;
+        }
+        return "discordrole@" + role_id;
     }
 
     @Override