From 935dfdcb32e09441d1894bf2bd5683a71c20e02b Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Tue, 10 Dec 2024 08:23:38 +0700 Subject: [PATCH] fix: some team stuff --- build-number.txt | 2 +- .../chomens_bot/plugins/TeamJoinerPlugin.java | 12 ++++++++++++ .../me/chayapak1/chomens_bot/plugins/TeamPlugin.java | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/build-number.txt b/build-number.txt index de697b51..872362fa 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1223 \ No newline at end of file +1226 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java index 940d7e58..5fbfdde5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java @@ -3,6 +3,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.Team; import me.chayapak1.chomens_bot.util.UUIDUtilities; +import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent; import java.util.ArrayList; @@ -16,9 +17,20 @@ public class TeamJoinerPlugin extends TickPlugin.Listener { this.bot = bot; this.teamName = bot.config.teamName; + bot.addListener(new Bot.Listener() { + @Override + public void connected(ConnectedEvent event) { + TeamJoinerPlugin.this.connected(); + } + }); + bot.tick.addListener(this); } + private void connected () { + addTeam(); + } + @Override public void onTick () { try { diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java index badffb85..a67eca66 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java @@ -3,6 +3,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.Team; import org.geysermc.mcprotocollib.network.Session; +import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent; import org.geysermc.mcprotocollib.network.packet.Packet; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetPlayerTeamPacket; @@ -15,6 +16,11 @@ public class TeamPlugin extends Bot.Listener { bot.addListener(this); } + @Override + public void disconnected(DisconnectedEvent event) { + teams.clear(); + } + public synchronized Team findTeamByName (String name) { for (Team team : new ArrayList<>(teams)) { if (team.teamName.equals(name)) return team;