small fixes

Flectone · Jul 16, 2023 · fa9d50a · fa9d50a
1 parent 8ef7b9a
commit fa9d50a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/net/flectone/custom/FPlayer.java b/src/main/java/net/flectone/custom/FPlayer.java
@@ -408,8 +408,8 @@ public void addChatBubble(String message){
         listChatBubbles.add(message);
     }
 
-    public void removeChatBubble(int number){
-        if (listChatBubbles.size() > number) listChatBubbles.remove(number);
+    public void removeChatBubble(){
+        if (!listChatBubbles.isEmpty()) listChatBubbles.remove(0);
     }
 
     public List<Entity> getChatBubbleEntities() {

diff --git a/src/main/java/net/flectone/listeners/AsyncPlayerChatListener.java b/src/main/java/net/flectone/listeners/AsyncPlayerChatListener.java
@@ -84,8 +84,6 @@ public void createMessage(Set<Player> recipients, Player player, String message,
                 .replace("<player>", FPlayerManager.getPlayer(player).getName());
 
         fCommands.sendGlobalMessage(recipients, configMessage, message, itemStack, true);
-
-        fCommands.getFPlayer().addChatBubble(message);
     }
 
     @EventHandler

diff --git a/src/main/java/net/flectone/listeners/EntityDismountListener.java b/src/main/java/net/flectone/listeners/EntityDismountListener.java
@@ -4,10 +4,10 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntitySpawnEvent;
 import org.spigotmc.event.entity.EntityDismountEvent;
 
 public class EntityDismountListener implements Listener {
+
     @EventHandler
     public void checkAreaEffectCloudDismount(EntityDismountEvent event){
         Entity entity = event.getEntity();

diff --git a/src/main/java/net/flectone/tickers/ChatBubbleTicker.java b/src/main/java/net/flectone/tickers/ChatBubbleTicker.java
@@ -40,7 +40,7 @@ public void run() {
             String message = fPlayer.getListChatBubbles().get(0);
             spawnMessageBubble(fPlayer.getPlayer(), message);
 
-            fPlayer.removeChatBubble(0);
+            fPlayer.removeChatBubble();
         });
     }