ChromaGaming/Chroma-Discord
1
0
Fork 0
Code Issues 21 Pull requests Projects Releases 8 Packages Wiki Activity

Fixes, added quitting fake players on disable

Browse source
This commit is contained in:
Norbi Peti 2017-08-06 02:23:13 +02:00
parent 649fd4611f
commit cda76fdb93
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -36,7 +36,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.6.2</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>

7
src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
View file

@ -9,6 +9,7 @@ import java.util.List;
import java.util.Random; import java.util.Random;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
@ -183,6 +184,8 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
@Override @Override
public void onDisable() { public void onDisable() {
stop = true; stop = true;
for(val entry : MCChatListener.ConnectedSenders.entrySet())
MCListener.callEventExcluding(new PlayerQuitEvent(entry.getValue(), ""), "ProtocolLib");
getConfig().set("lastannouncementtime", lastannouncementtime); getConfig().set("lastannouncementtime", lastannouncementtime);
getConfig().set("lastseentime", lastseentime); getConfig().set("lastseentime", lastseentime);
getConfig().set("gameroles", GameRoles); getConfig().set("gameroles", GameRoles);
@ -218,7 +221,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
for (int i = json.size() - 1; i >= 0; i--) { for (int i = json.size() - 1; i >= 0; i--) {
JsonObject item = json.get(i).getAsJsonObject(); JsonObject item = json.get(i).getAsJsonObject();
final JsonObject data = item.get("data").getAsJsonObject(); final JsonObject data = item.get("data").getAsJsonObject();
String author = "/u/" + data.get("author").getAsString(); String author = data.get("author").getAsString();
JsonElement distinguishedjson = data.get("distinguished"); JsonElement distinguishedjson = data.get("distinguished");
String distinguished; String distinguished;
if (distinguishedjson.isJsonNull()) if (distinguishedjson.isJsonNull())
@ -239,6 +242,8 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
if (id != null) if (id != null)
author = "<@" + id + ">"; author = "<@" + id + ">";
} while (false); } while (false);
if (!author.startsWith("<"))
author = "/u/" + author;
(distinguished != null && distinguished.equals("moderator") ? modmsgsb : msgsb) (distinguished != null && distinguished.equals("moderator") ? modmsgsb : msgsb)
.append("A new post was submitted to the subreddit by ").append(author).append("\n") .append("A new post was submitted to the subreddit by ").append(author).append("\n")
.append(permalink).append("\n"); .append(permalink).append("\n");