Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleMessenger

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:37:12 +02:00
parent 82c2d14430
commit 49b5730e5f
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/client/Character.java
View File

@@ -157,7 +157,7 @@ public class Character extends AbstractCharacterObject {
private MaplePartyCharacter mpc = null; private MaplePartyCharacter mpc = null;
private Inventory[] inventory; private Inventory[] inventory;
private Job job = Job.BEGINNER; private Job job = Job.BEGINNER;
private MapleMessenger messenger = null; private Messenger messenger = null;
private MapleMiniGame miniGame; private MapleMiniGame miniGame;
private MapleRockPaperScissor rps; private MapleRockPaperScissor rps;
private Mount maplemount; private Mount maplemount;
@@ -5376,7 +5376,7 @@ public class Character extends AbstractCharacterObject {
return maplemount; return maplemount;
} }
public MapleMessenger getMessenger() { public Messenger getMessenger() {
return messenger; return messenger;
} }
@@ -5603,7 +5603,7 @@ public class Character extends AbstractCharacterObject {
} }
public void closePlayerMessenger() { public void closePlayerMessenger() {
MapleMessenger m = this.getMessenger(); Messenger m = this.getMessenger();
if (m == null) { if (m == null) {
return; return;
} }
@@ -7138,7 +7138,7 @@ public class Character extends AbstractCharacterObject {
int messengerid = rs.getInt("messengerid"); int messengerid = rs.getInt("messengerid");
int position = rs.getInt("messengerposition"); int position = rs.getInt("messengerposition");
if (messengerid > 0 && position < 4 && position > -1) { if (messengerid > 0 && position < 4 && position > -1) {
MapleMessenger messenger = wserv.getMessenger(messengerid); Messenger messenger = wserv.getMessenger(messengerid);
if (messenger != null) { if (messenger != null) {
ret.messenger = messenger; ret.messenger = messenger;
ret.messengerposition = position; ret.messengerposition = position;
@@ -9172,7 +9172,7 @@ public class Character extends AbstractCharacterObject {
this.mapid = PmapId; this.mapid = PmapId;
} }
public void setMessenger(MapleMessenger messenger) { public void setMessenger(Messenger messenger) {
this.messenger = messenger; this.messenger = messenger;
} }

4
src/main/java/net/server/channel/handlers/MessengerHandler.java
View File

@@ -29,8 +29,8 @@ import net.server.coordinator.world.InviteCoordinator;
import net.server.coordinator.world.InviteCoordinator.InviteResult; import net.server.coordinator.world.InviteCoordinator.InviteResult;
import net.server.coordinator.world.InviteCoordinator.InviteType; import net.server.coordinator.world.InviteCoordinator.InviteType;
import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; import net.server.coordinator.world.InviteCoordinator.MapleInviteResult;
import net.server.world.MapleMessenger;
import net.server.world.MapleMessengerCharacter; import net.server.world.MapleMessengerCharacter;
import net.server.world.Messenger;
import net.server.world.World; import net.server.world.World;
import tools.PacketCreator; import tools.PacketCreator;
@@ -43,7 +43,7 @@ public final class MessengerHandler extends AbstractPacketHandler {
byte mode = p.readByte(); byte mode = p.readByte();
Character player = c.getPlayer(); Character player = c.getPlayer();
World world = c.getWorldServer(); World world = c.getWorldServer();
MapleMessenger messenger = player.getMessenger(); Messenger messenger = player.getMessenger();
switch (mode) { switch (mode) {
case 0x00: case 0x00:
int messengerid = p.readInt(); int messengerid = p.readInt();

18
src/main/java/net/server/world/MapleMessenger.java → src/main/java/net/server/world/Messenger.java
View File

@@ -26,17 +26,17 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
public final class MapleMessenger { public final class Messenger {
private int id; private final int id;
private List<MapleMessengerCharacter> members = new ArrayList<>(3); private final List<MapleMessengerCharacter> members = new ArrayList<>(3);
private boolean[] pos = new boolean[3]; private final boolean[] pos = new boolean[3];
public MapleMessenger(int id, MapleMessengerCharacter chrfor) { public Messenger(int id, MapleMessengerCharacter chrfor) {
this.id = id; this.id = id;
for (int i = 0; i < 3; i++){ for (int i = 0; i < 3; i++) {
pos[i] = false; pos[i] = false;
} }
addMember(chrfor, chrfor.getPosition()); addMember(chrfor, chrfor.getPosition());
} }
@@ -55,7 +55,7 @@ public final class MapleMessenger {
} }
public void removeMember(MapleMessengerCharacter member) { public void removeMember(MapleMessengerCharacter member) {
int position = member.getPosition(); int position = member.getPosition();
pos[position] = false; pos[position] = false;
members.remove(member); members.remove(member);
} }

28
src/main/java/net/server/world/World.java
View File

@@ -80,7 +80,7 @@ public class World {
private List<Channel> channels = new ArrayList<>(); private List<Channel> channels = new ArrayList<>();
private Map<Integer, Byte> pnpcStep = new HashMap<>(); private Map<Integer, Byte> pnpcStep = new HashMap<>();
private Map<Integer, Short> pnpcPodium = new HashMap<>(); private Map<Integer, Short> pnpcPodium = new HashMap<>();
private Map<Integer, MapleMessenger> messengers = new HashMap<>(); private Map<Integer, Messenger> messengers = new HashMap<>();
private AtomicInteger runningMessengerId = new AtomicInteger(); private AtomicInteger runningMessengerId = new AtomicInteger();
private Map<Integer, Family> families = new LinkedHashMap<>(); private Map<Integer, Family> families = new LinkedHashMap<>();
private Map<Integer, Integer> relationships = new HashMap<>(); private Map<Integer, Integer> relationships = new HashMap<>();
@@ -1044,12 +1044,12 @@ public class World {
return foundsChars.toArray(new CharacterIdChannelPair[foundsChars.size()]); return foundsChars.toArray(new CharacterIdChannelPair[foundsChars.size()]);
} }
public MapleMessenger getMessenger(int messengerid) { public Messenger getMessenger(int messengerid) {
return messengers.get(messengerid); return messengers.get(messengerid);
} }
public void leaveMessenger(int messengerid, MapleMessengerCharacter target) { public void leaveMessenger(int messengerid, MapleMessengerCharacter target) {
MapleMessenger messenger = getMessenger(messengerid); Messenger messenger = getMessenger(messengerid);
if (messenger == null) { if (messenger == null) {
throw new IllegalArgumentException("No messenger with the specified messengerid exists"); throw new IllegalArgumentException("No messenger with the specified messengerid exists");
} }
@@ -1062,7 +1062,7 @@ public class World {
if (isConnected(target)) { if (isConnected(target)) {
Character targetChr = getPlayerStorage().getCharacterByName(target); Character targetChr = getPlayerStorage().getCharacterByName(target);
if (targetChr != null) { if (targetChr != null) {
MapleMessenger messenger = targetChr.getMessenger(); Messenger messenger = targetChr.getMessenger();
if (messenger == null) { if (messenger == null) {
Character from = getChannel(fromchannel).getPlayerStorage().getCharacterByName(sender); Character from = getChannel(fromchannel).getPlayerStorage().getCharacterByName(sender);
if (from != null) { if (from != null) {
@@ -1081,7 +1081,7 @@ public class World {
} }
} }
public void addMessengerPlayer(MapleMessenger messenger, String namefrom, int fromchannel, int position) { public void addMessengerPlayer(Messenger messenger, String namefrom, int fromchannel, int position) {
for (MapleMessengerCharacter messengerchar : messenger.getMembers()) { for (MapleMessengerCharacter messengerchar : messenger.getMembers()) {
Character chr = getPlayerStorage().getCharacterByName(messengerchar.getName()); Character chr = getPlayerStorage().getCharacterByName(messengerchar.getName());
if(chr == null){ if(chr == null){
@@ -1097,7 +1097,7 @@ public class World {
} }
} }
public void removeMessengerPlayer(MapleMessenger messenger, int position) { public void removeMessengerPlayer(Messenger messenger, int position) {
for (MapleMessengerCharacter messengerchar : messenger.getMembers()) { for (MapleMessengerCharacter messengerchar : messenger.getMembers()) {
Character chr = getPlayerStorage().getCharacterByName(messengerchar.getName()); Character chr = getPlayerStorage().getCharacterByName(messengerchar.getName());
if (chr != null) { if (chr != null) {
@@ -1106,7 +1106,7 @@ public class World {
} }
} }
public void messengerChat(MapleMessenger messenger, String chattext, String namefrom) { public void messengerChat(Messenger messenger, String chattext, String namefrom) {
String from = ""; String from = "";
String to1 = ""; String to1 = "";
String to2 = ""; String to2 = "";
@@ -1139,12 +1139,12 @@ public class World {
} }
public void updateMessenger(int messengerid, String namefrom, int fromchannel) { public void updateMessenger(int messengerid, String namefrom, int fromchannel) {
MapleMessenger messenger = getMessenger(messengerid); Messenger messenger = getMessenger(messengerid);
int position = messenger.getPositionByName(namefrom); int position = messenger.getPositionByName(namefrom);
updateMessenger(messenger, namefrom, position, fromchannel); updateMessenger(messenger, namefrom, position, fromchannel);
} }
public void updateMessenger(MapleMessenger messenger, String namefrom, int position, int fromchannel) { public void updateMessenger(Messenger messenger, String namefrom, int position, int fromchannel) {
for (MapleMessengerCharacter messengerchar : messenger.getMembers()) { for (MapleMessengerCharacter messengerchar : messenger.getMembers()) {
Channel ch = getChannel(fromchannel); Channel ch = getChannel(fromchannel);
if (!(messengerchar.getName().equals(namefrom))) { if (!(messengerchar.getName().equals(namefrom))) {
@@ -1157,7 +1157,7 @@ public class World {
} }
public void silentLeaveMessenger(int messengerid, MapleMessengerCharacter target) { public void silentLeaveMessenger(int messengerid, MapleMessengerCharacter target) {
MapleMessenger messenger = getMessenger(messengerid); Messenger messenger = getMessenger(messengerid);
if (messenger == null) { if (messenger == null) {
throw new IllegalArgumentException("No messenger with the specified messengerid exists"); throw new IllegalArgumentException("No messenger with the specified messengerid exists");
} }
@@ -1165,7 +1165,7 @@ public class World {
} }
public void joinMessenger(int messengerid, MapleMessengerCharacter target, String from, int fromchannel) { public void joinMessenger(int messengerid, MapleMessengerCharacter target, String from, int fromchannel) {
MapleMessenger messenger = getMessenger(messengerid); Messenger messenger = getMessenger(messengerid);
if (messenger == null) { if (messenger == null) {
throw new IllegalArgumentException("No messenger with the specified messengerid exists"); throw new IllegalArgumentException("No messenger with the specified messengerid exists");
} }
@@ -1174,16 +1174,16 @@ public class World {
} }
public void silentJoinMessenger(int messengerid, MapleMessengerCharacter target, int position) { public void silentJoinMessenger(int messengerid, MapleMessengerCharacter target, int position) {
MapleMessenger messenger = getMessenger(messengerid); Messenger messenger = getMessenger(messengerid);
if (messenger == null) { if (messenger == null) {
throw new IllegalArgumentException("No messenger with the specified messengerid exists"); throw new IllegalArgumentException("No messenger with the specified messengerid exists");
} }
messenger.addMember(target, position); messenger.addMember(target, position);
} }
public MapleMessenger createMessenger(MapleMessengerCharacter chrfor) { public Messenger createMessenger(MapleMessengerCharacter chrfor) {
int messengerid = runningMessengerId.getAndIncrement(); int messengerid = runningMessengerId.getAndIncrement();
MapleMessenger messenger = new MapleMessenger(messengerid, chrfor); Messenger messenger = new Messenger(messengerid, chrfor);
messengers.put(messenger.getId(), messenger); messengers.put(messenger.getId(), messenger);
return messenger; return messenger;
} }