Rename and clean up MapleMessengerCharacter

src/main/java/client/Character.java

@@ -1810,7 +1810,7 @@ public class Character extends AbstractCharacterObject {
     public void checkMessenger() {
         if (messenger != null && messengerposition < 4 && messengerposition > -1) {
             World worldz = getWorldServer();
-            worldz.silentJoinMessenger(messenger.getId(), new MapleMessengerCharacter(this, messengerposition), messengerposition);
+            worldz.silentJoinMessenger(messenger.getId(), new MessengerCharacter(this, messengerposition), messengerposition);
             worldz.updateMessenger(getMessenger().getId(), name, client.getChannel());
         }
     }
@@ -5609,7 +5609,7 @@ public class Character extends AbstractCharacterObject {
         }
 
         World w = getWorldServer();
-        MapleMessengerCharacter messengerplayer = new MapleMessengerCharacter(this, this.getMessengerPosition());
+        MessengerCharacter messengerplayer = new MessengerCharacter(this, this.getMessengerPosition());
 
         w.leaveMessenger(m.getId(), messengerplayer);
         this.setMessenger(null);

src/main/java/client/Client.java

@@ -965,7 +965,7 @@ public class Client extends ChannelInboundHandlerAdapter {
             final int messengerid = player.getMessenger() == null ? 0 : player.getMessenger().getId();
             //final int fid = player.getFamilyId();
             final BuddyList bl = player.getBuddylist();
-            final MapleMessengerCharacter chrm = new MapleMessengerCharacter(player, 0);
+            final MessengerCharacter chrm = new MessengerCharacter(player, 0);
             final GuildCharacter chrg = player.getMGC();
             final Guild guild = player.getGuild();
 

src/main/java/net/server/channel/handlers/MessengerHandler.java

@@ -29,8 +29,8 @@ import net.server.coordinator.world.InviteCoordinator;
 import net.server.coordinator.world.InviteCoordinator.InviteResult;
 import net.server.coordinator.world.InviteCoordinator.InviteType;
 import net.server.coordinator.world.InviteCoordinator.MapleInviteResult;
-import net.server.world.MapleMessengerCharacter;
 import net.server.world.Messenger;
+import net.server.world.MessengerCharacter;
 import net.server.world.World;
 import tools.PacketCreator;
 
@@ -51,7 +51,7 @@ public final class MessengerHandler extends AbstractPacketHandler {
                             if (messengerid == 0) {
                                 InviteCoordinator.removeInvite(InviteType.MESSENGER, player.getId());
 
-                                MapleMessengerCharacter messengerplayer = new MapleMessengerCharacter(player, 0);
+                                MessengerCharacter messengerplayer = new MessengerCharacter(player, 0);
                                 messenger = world.createMessenger(messengerplayer);
                                 player.setMessenger(messenger);
                                 player.setMessengerPosition(0);
@@ -62,7 +62,7 @@ public final class MessengerHandler extends AbstractPacketHandler {
                                     InviteResult res = inviteRes.result;
                                     if (res == InviteResult.ACCEPTED) {
                                         int position = messenger.getLowestPosition();
-                                        MapleMessengerCharacter messengerplayer = new MapleMessengerCharacter(player, position);
+                                        MessengerCharacter messengerplayer = new MessengerCharacter(player, position);
                                         if (messenger.getMembers().size() < 3) {
                                             player.setMessenger(messenger);
                                             player.setMessengerPosition(position);
@@ -114,7 +114,7 @@ public final class MessengerHandler extends AbstractPacketHandler {
                         break;
                     case 0x06:
                         if (messenger != null) {
-                            MapleMessengerCharacter messengerplayer = new MapleMessengerCharacter(player, player.getMessengerPosition());
+                            MessengerCharacter messengerplayer = new MessengerCharacter(player, player.getMessengerPosition());
                             input = p.readString();
                             world.messengerChat(messenger, input, messengerplayer.getName());
                         }

src/main/java/net/server/world/Messenger.java

@@ -29,10 +29,10 @@ import java.util.List;
 public final class Messenger {
 
     private final int id;
-    private final List<MapleMessengerCharacter> members = new ArrayList<>(3);
+    private final List<MessengerCharacter> members = new ArrayList<>(3);
     private final boolean[] pos = new boolean[3];
 
-    public Messenger(int id, MapleMessengerCharacter chrfor) {
+    public Messenger(int id, MessengerCharacter chrfor) {
         this.id = id;
         for (int i = 0; i < 3; i++) {
             pos[i] = false;
@@ -44,17 +44,17 @@ public final class Messenger {
         return id;
     }
 
-    public Collection<MapleMessengerCharacter> getMembers() {
+    public Collection<MessengerCharacter> getMembers() {
         return Collections.unmodifiableList(members);
     }
 
-    public void addMember(MapleMessengerCharacter member, int position) {
+    public void addMember(MessengerCharacter member, int position) {
         members.add(member);
         member.setPosition(position);
         pos[position] = true;
     }
 
-    public void removeMember(MapleMessengerCharacter member) {
+    public void removeMember(MessengerCharacter member) {
         int position = member.getPosition();
         pos[position] = false;
         members.remove(member);
@@ -70,7 +70,7 @@ public final class Messenger {
     }
 
     public int getPositionByName(String name) {
-        for (MapleMessengerCharacter messengerchar : members) {
+        for (MessengerCharacter messengerchar : members) {
             if (messengerchar.getName().equals(name)) {
                 return messengerchar.getPosition();
             }

src/main/java/net/server/world/MessengerCharacter.java

@@ -23,13 +23,14 @@ package net.server.world;
 
 import client.Character;
 
-public class MapleMessengerCharacter {
+public class MessengerCharacter {
-    private String name;
+    private final String name;
-    private int id, position;
+    private final int id;
-    private int channel;
+    private int position;
-    private boolean online;
+    private final int channel;
+    private final boolean online;
 
-    public MapleMessengerCharacter(Character maplechar, int position) {
+    public MessengerCharacter(Character maplechar, int position) {
         this.name = maplechar.getName();
         this.channel = maplechar.getClient().getChannel();
         this.id = maplechar.getId();
@@ -80,14 +81,9 @@ public class MapleMessengerCharacter {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        final MapleMessengerCharacter other = (MapleMessengerCharacter) obj;
+        final MessengerCharacter other = (MessengerCharacter) obj;
         if (name == null) {
-            if (other.name != null) {
+            return other.name == null;
-                return false;
+        } else return name.equals(other.name);
-            }
-        } else if (!name.equals(other.name)) {
-            return false;
-        }
-        return true;
     }
 }

src/main/java/net/server/world/World.java

@@ -1048,7 +1048,7 @@ public class World {
         return messengers.get(messengerid);
     }
 
-    public void leaveMessenger(int messengerid, MapleMessengerCharacter target) {
+    public void leaveMessenger(int messengerid, MessengerCharacter target) {
         Messenger messenger = getMessenger(messengerid);
         if (messenger == null) {
             throw new IllegalArgumentException("No messenger with the specified messengerid exists");
@@ -1082,7 +1082,7 @@ public class World {
     }
 
     public void addMessengerPlayer(Messenger messenger, String namefrom, int fromchannel, int position) {
-    	for (MapleMessengerCharacter messengerchar : messenger.getMembers()) {
+    	for (MessengerCharacter messengerchar : messenger.getMembers()) {
     		Character chr = getPlayerStorage().getCharacterByName(messengerchar.getName());
     		if(chr == null){
     			continue;
@@ -1098,7 +1098,7 @@ public class World {
     }
 
     public void removeMessengerPlayer(Messenger messenger, int position) {
-        for (MapleMessengerCharacter messengerchar : messenger.getMembers()) {
+        for (MessengerCharacter messengerchar : messenger.getMembers()) {
             Character chr = getPlayerStorage().getCharacterByName(messengerchar.getName());
             if (chr != null) {
                 chr.sendPacket(PacketCreator.removeMessengerPlayer(position));
@@ -1110,7 +1110,7 @@ public class World {
     	String from = "";
     	String to1 = "";
     	String to2 = "";
-        for (MapleMessengerCharacter messengerchar : messenger.getMembers()) {
+        for (MessengerCharacter messengerchar : messenger.getMembers()) {
             if (!(messengerchar.getName().equals(namefrom))) {
                 Character chr = getPlayerStorage().getCharacterByName(messengerchar.getName());
                 if (chr != null) {
@@ -1145,7 +1145,7 @@ public class World {
     }
 
     public void updateMessenger(Messenger messenger, String namefrom, int position, int fromchannel) {
-        for (MapleMessengerCharacter messengerchar : messenger.getMembers()) {
+        for (MessengerCharacter messengerchar : messenger.getMembers()) {
             Channel ch = getChannel(fromchannel);
             if (!(messengerchar.getName().equals(namefrom))) {
                 Character chr = ch.getPlayerStorage().getCharacterByName(messengerchar.getName());
@@ -1156,7 +1156,7 @@ public class World {
         }
     }
 
-    public void silentLeaveMessenger(int messengerid, MapleMessengerCharacter target) {
+    public void silentLeaveMessenger(int messengerid, MessengerCharacter target) {
         Messenger messenger = getMessenger(messengerid);
         if (messenger == null) {
             throw new IllegalArgumentException("No messenger with the specified messengerid exists");
@@ -1164,7 +1164,7 @@ public class World {
         messenger.addMember(target, target.getPosition());
     }
 
-    public void joinMessenger(int messengerid, MapleMessengerCharacter target, String from, int fromchannel) {
+    public void joinMessenger(int messengerid, MessengerCharacter target, String from, int fromchannel) {
         Messenger messenger = getMessenger(messengerid);
         if (messenger == null) {
             throw new IllegalArgumentException("No messenger with the specified messengerid exists");
@@ -1173,7 +1173,7 @@ public class World {
         addMessengerPlayer(messenger, from, fromchannel, target.getPosition());
     }
 
-    public void silentJoinMessenger(int messengerid, MapleMessengerCharacter target, int position) {
+    public void silentJoinMessenger(int messengerid, MessengerCharacter target, int position) {
         Messenger messenger = getMessenger(messengerid);
         if (messenger == null) {
             throw new IllegalArgumentException("No messenger with the specified messengerid exists");
@@ -1181,7 +1181,7 @@ public class World {
         messenger.addMember(target, position);
     }
 
-    public Messenger createMessenger(MapleMessengerCharacter chrfor) {
+    public Messenger createMessenger(MessengerCharacter chrfor) {
         int messengerid = runningMessengerId.getAndIncrement();
         Messenger messenger = new Messenger(messengerid, chrfor);
         messengers.put(messenger.getId(), messenger);