1.3 update

codedcosmos · Mar 24, 2020 · 767fc14 · 767fc14
1 parent 9443d3a
commit 767fc14
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'codedcosmos'
-version '1.2'
+version '1.3'
 mainClassName = 'codedcosmos.enderbot.core.EnderBot'
 
 sourceCompatibility = 1.8

diff --git a/res/plugin.yml b/res/plugin.yml
@@ -1,5 +1,5 @@
 name: EnderBot
-version: 1.2
+version: 1.3
 author: codedcosmos
 main: codedcosmos.enderbot.plugin.MinecraftPlugin
 api-version: 1.15

diff --git a/src/codedcosmos/enderbot/core/EnderBot.java b/src/codedcosmos/enderbot/core/EnderBot.java
@@ -18,7 +18,7 @@
 
 public class EnderBot {
 
-	private static final String VERSION = "1.2";
+	private static final String VERSION = "1.3";
 	private static boolean runningInSpigot = false;
 
 	public static void load(boolean runningInSpigot) {

diff --git a/src/codedcosmos/enderbot/discord/CachedTextChannel.java b/src/codedcosmos/enderbot/discord/CachedTextChannel.java
@@ -34,7 +34,7 @@ public CachedTextChannel(String name, Guild guild) {
 
 	public void sendMessage(String message) {
 		if (!isValid) return;
-		TextChannelHandler.sendThenWait(channel, message);
+		TextChannelHandler.send(channel, message);
 	}
 
 	public boolean matches(TextChannel channel) {

diff --git a/src/codedcosmos/enderbot/plugin/MinecraftChatListener.java b/src/codedcosmos/enderbot/plugin/MinecraftChatListener.java
@@ -17,9 +17,12 @@
 import codedcosmos.enderbot.discord.Guilds;
 import codedcosmos.enderbot.utils.Console;
 import codedcosmos.enderbot.utils.Log;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerAdvancementDoneEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
@@ -45,6 +48,20 @@ public void onPlayerQuit(PlayerQuitEvent event) {
 		}
 	}
 
+	@EventHandler
+	public void onPlayerAdvancementDone(PlayerAdvancementDoneEvent event) {
+		for (GuildContext context : Guilds.getContexts()) {
+			context.getInGameChannel().sendMessage("`"+format(event.getPlayer().getDisplayName()) + " has made the advancement ["+ event.getAdvancement().getKey().getKey() + "]`");
+		}
+	}
+
+	@EventHandler
+	public void onPlayerDeath(PlayerDeathEvent event) {
+		for (GuildContext context : Guilds.getContexts()) {
+			context.getInGameChannel().sendMessage("`"+event.getDeathMessage()+"`");
+		}
+	}
+
 	public String format(String username) {
 		String text = "";
 		boolean skipNext = false;