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

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/packet/logging/MapleLogger.java
View File

@@ -20,16 +20,16 @@
*/
package net.packet.logging;
import client.Character;
import client.MapleClient;
import net.opcodes.RecvOpcode;
import tools.FilePrinter;
import tools.HexTool;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import net.opcodes.RecvOpcode;
import client.MapleCharacter;
import client.MapleClient;
import tools.FilePrinter;
import tools.HexTool;
/**
* Logs packets to console and file.
*
@@ -41,7 +41,7 @@ public class MapleLogger {
public static final Set<Integer> ignored = new HashSet<>();
public static void logRecv(MapleClient c, short packetId, byte[] packetContent) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (chr == null) {
return;
}

29
src/main/java/net/server/PlayerStorage.java
View File

@@ -21,13 +21,8 @@
*/
package net.server;
import client.Character;
import client.MapleClient;
import client.MapleCharacter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.LinkedHashMap;
import java.util.Map;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
@@ -35,14 +30,16 @@ import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import java.util.*;
public class PlayerStorage {
private final MonitoredReentrantReadWriteLock locks = new MonitoredReentrantReadWriteLock(MonitoredLockType.PLAYER_STORAGE, true);
private final Map<Integer, MapleCharacter> storage = new LinkedHashMap<>();
private final Map<String, MapleCharacter> nameStorage = new LinkedHashMap<>();
private final Map<Integer, Character> storage = new LinkedHashMap<>();
private final Map<String, Character> nameStorage = new LinkedHashMap<>();
private MonitoredReadLock rlock = MonitoredReadLockFactory.createLock(locks);
private MonitoredWriteLock wlock = MonitoredWriteLockFactory.createLock(locks);
public void addPlayer(MapleCharacter chr) {
public void addPlayer(Character chr) {
wlock.lock();
try {
storage.put(chr.getId(), chr);
@@ -52,10 +49,10 @@ public class PlayerStorage {
}
}
public MapleCharacter removePlayer(int chr) {
public Character removePlayer(int chr) {
wlock.lock();
try {
MapleCharacter mc = storage.remove(chr);
Character mc = storage.remove(chr);
if(mc != null) nameStorage.remove(mc.getName().toLowerCase());
return mc;
@@ -64,7 +61,7 @@ public class PlayerStorage {
}
}
public MapleCharacter getCharacterByName(String name) {
public Character getCharacterByName(String name) {
rlock.lock();
try {
return nameStorage.get(name.toLowerCase());
@@ -73,7 +70,7 @@ public class PlayerStorage {
}
}
public MapleCharacter getCharacterById(int id) {
public Character getCharacterById(int id) {
rlock.lock();
try {
return storage.get(id);
@@ -82,7 +79,7 @@ public class PlayerStorage {
}
}
public Collection<MapleCharacter> getAllCharacters() {
public Collection<Character> getAllCharacters() {
rlock.lock();
try {
return new ArrayList<>(storage.values());
@@ -92,7 +89,7 @@ public class PlayerStorage {
}
public final void disconnectAll() {
List<MapleCharacter> chrList;
List<Character> chrList;
rlock.lock();
try {
chrList = new ArrayList<>(storage.values());
@@ -100,7 +97,7 @@ public class PlayerStorage {
rlock.unlock();
}
for(MapleCharacter mc : chrList) {
for(Character mc : chrList) {
MapleClient client = mc.getClient();
if(client != null) {
client.forceDisconnect();

62
src/main/java/net/server/Server.java
View File

@@ -21,7 +21,7 @@
*/
package net.server;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleFamily;
import client.SkillFactory;
@@ -596,7 +596,7 @@ public class Server {
public void commitActiveCoupons() {
for (World world : getWorlds()) {
for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) {
for (Character chr : world.getPlayerStorage().getAllCharacters()) {
if (!chr.isLoggedin()) {
continue;
}
@@ -656,7 +656,7 @@ public class Server {
while (!processDiseaseAnnounceClients.isEmpty()) {
MapleClient c = processDiseaseAnnounceClients.remove(0);
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (player != null && player.isLoggedinWorld()) {
player.announceDiseases();
player.collectDiseases();
@@ -1084,7 +1084,7 @@ public class Server {
return getGuild(id, world, null);
}
public MapleGuild getGuild(int id, int world, MapleCharacter mc) {
public MapleGuild getGuild(int id, int world, Character mc) {
synchronized (guilds) {
MapleGuild g = guilds.get(id);
if (g != null) {
@@ -1113,12 +1113,12 @@ public class Server {
}
}
public void setGuildMemberOnline(MapleCharacter mc, boolean bOnline, int channel) {
public void setGuildMemberOnline(Character mc, boolean bOnline, int channel) {
MapleGuild g = getGuild(mc.getGuildId(), mc.getWorld(), mc);
g.setOnline(mc.getId(), bOnline, channel);
}
public int addGuildMember(MapleGuildCharacter mgc, MapleCharacter chr) {
public int addGuildMember(MapleGuildCharacter mgc, Character chr) {
MapleGuild g = guilds.get(mgc.getGuildId());
if (g != null) {
return g.addGuildMember(mgc, chr);
@@ -1233,7 +1233,7 @@ public class Server {
return buffStorage;
}
public void deleteGuildCharacter(MapleCharacter mc) {
public void deleteGuildCharacter(Character mc) {
setGuildMemberOnline(mc, false, (byte) -1);
if (mc.getMGC().getGuildRank() > 1) {
leaveGuild(mc.getMGC());
@@ -1255,7 +1255,7 @@ public class Server {
public void reloadGuildCharacters(int world) {
World worlda = getWorld(world);
for (MapleCharacter mc : worlda.getPlayerStorage().getAllCharacters()) {
for (Character mc : worlda.getPlayerStorage().getAllCharacters()) {
if (mc.getGuildId() > 0) {
setGuildMemberOnline(mc, true, worlda.getId());
memberLevelJobUpdate(mc.getMGC());
@@ -1278,7 +1278,7 @@ public class Server {
public boolean isGmOnline(int world) {
for (Channel ch : getChannelsFromWorld(world)) {
for (MapleCharacter player : ch.getPlayerStorage().getAllCharacters()) {
for (Character player : ch.getPlayerStorage().getAllCharacters()) {
if (player.isGM()) {
return true;
}
@@ -1354,8 +1354,8 @@ public class Server {
}
}
public void updateCharacterEntry(MapleCharacter chr) {
MapleCharacter chrView = chr.generateCharacterEntry();
public void updateCharacterEntry(Character chr) {
Character chrView = chr.generateCharacterEntry();
lgnWLock.lock();
try {
@@ -1368,7 +1368,7 @@ public class Server {
}
}
public void createCharacterEntry(MapleCharacter chr) {
public void createCharacterEntry(Character chr) {
Integer accountid = chr.getAccountID(), chrid = chr.getId(), world = chr.getWorld();
lgnWLock.lock();
@@ -1380,7 +1380,7 @@ public class Server {
worldChars.put(chrid, world);
MapleCharacter chrView = chr.generateCharacterEntry();
Character chrView = chr.generateCharacterEntry();
World wserv = this.getWorld(chrView.getWorld());
if (wserv != null) {
@@ -1411,7 +1411,7 @@ public class Server {
}
}
public void transferWorldCharacterEntry(MapleCharacter chr, Integer toWorld) { // used before setting the new worldid on the character object
public void transferWorldCharacterEntry(Character chr, Integer toWorld) { // used before setting the new worldid on the character object
lgnWLock.lock();
try {
Integer chrid = chr.getId(), accountid = chr.getAccountID(), world = worldChars.get(chr.getId());
@@ -1424,7 +1424,7 @@ public class Server {
worldChars.put(chrid, toWorld);
MapleCharacter chrView = chr.generateCharacterEntry();
Character chrView = chr.generateCharacterEntry();
World wserv = this.getWorld(toWorld);
if (wserv != null) {
@@ -1452,20 +1452,20 @@ public class Server {
}
*/
public Pair<Pair<Integer, List<MapleCharacter>>, List<Pair<Integer, List<MapleCharacter>>>> loadAccountCharlist(Integer accountId, int visibleWorlds) {
public Pair<Pair<Integer, List<Character>>, List<Pair<Integer, List<Character>>>> loadAccountCharlist(Integer accountId, int visibleWorlds) {
List<World> wlist = this.getWorlds();
if (wlist.size() > visibleWorlds) {
wlist = wlist.subList(0, visibleWorlds);
}
List<Pair<Integer, List<MapleCharacter>>> accChars = new ArrayList<>(wlist.size() + 1);
List<Pair<Integer, List<Character>>> accChars = new ArrayList<>(wlist.size() + 1);
int chrTotal = 0;
List<MapleCharacter> lastwchars = null;
List<Character> lastwchars = null;
lgnRLock.lock();
try {
for (World w : wlist) {
List<MapleCharacter> wchars = w.getAccountCharactersView(accountId);
List<Character> wchars = w.getAccountCharactersView(accountId);
if (wchars == null) {
if (!accountChars.containsKey(accountId)) {
accountCharacterCount.put(accountId, (short) 0);
@@ -1485,14 +1485,14 @@ public class Server {
return new Pair<>(new Pair<>(chrTotal, lastwchars), accChars);
}
private static Pair<Short, List<List<MapleCharacter>>> loadAccountCharactersViewFromDb(int accId, int wlen) {
private static Pair<Short, List<List<Character>>> loadAccountCharactersViewFromDb(int accId, int wlen) {
short characterCount = 0;
List<List<MapleCharacter>> wchars = new ArrayList<>(wlen);
List<List<Character>> wchars = new ArrayList<>(wlen);
for (int i = 0; i < wlen; i++) {
wchars.add(i, new LinkedList<>());
}
List<MapleCharacter> chars = new LinkedList<>();
List<Character> chars = new LinkedList<>();
int curWorld = 0;
try {
List<Pair<Item, Integer>> accEquips = ItemFactory.loadEquippedItems(accId, true, true);
@@ -1529,7 +1529,7 @@ public class Server {
}
Integer cid = rs.getInt("id");
chars.add(MapleCharacter.loadCharacterEntryFromDB(rs, accPlayerEquips.get(cid)));
chars.add(Character.loadCharacterEntryFromDB(rs, accPlayerEquips.get(cid)));
}
}
}
@@ -1579,7 +1579,7 @@ public class Server {
int characterId = rs.getInt("characterId");
String oldName = rs.getString("old");
String newName = rs.getString("new");
boolean success = MapleCharacter.doNameChange(con, characterId, oldName, newName, nameChangeId);
boolean success = Character.doNameChange(con, characterId, oldName, newName, nameChangeId);
if (!success) {
con.rollback(); //discard changes
} else {
@@ -1610,7 +1610,7 @@ public class Server {
int characterId = rs.getInt("characterId");
int oldWorld = rs.getInt("from");
int newWorld = rs.getInt("to");
String reason = MapleCharacter.checkWorldTransferEligibility(con, characterId, oldWorld, newWorld); //check if character is still eligible
String reason = Character.checkWorldTransferEligibility(con, characterId, oldWorld, newWorld); //check if character is still eligible
if (reason != null) {
removedTransfers.add(nameChangeId);
FilePrinter.print(FilePrinter.WORLD_TRANSFER, "World transfer cancelled : Character ID " + characterId + " at " + Calendar.getInstance().getTime().toString() + ", Reason : " + reason);
@@ -1636,7 +1636,7 @@ public class Server {
int characterId = rs.getInt("characterId");
int oldWorld = rs.getInt("from");
int newWorld = rs.getInt("to");
boolean success = MapleCharacter.doWorldTransfer(con, characterId, oldWorld, newWorld, nameChangeId);
boolean success = Character.doWorldTransfer(con, characterId, oldWorld, newWorld, nameChangeId);
if (!success) {
con.rollback();
} else {
@@ -1680,7 +1680,7 @@ public class Server {
World wserv = this.getWorld(aw);
if (wserv != null) {
for (MapleCharacter chr : wserv.getAllCharactersView()) {
for (Character chr : wserv.getAllCharactersView()) {
if (gmLevel < chr.gmLevel()) {
gmLevel = chr.gmLevel();
}
@@ -1698,11 +1698,11 @@ public class Server {
private int loadAccountCharactersView(Integer accId, int gmLevel, int fromWorldid) { // returns the maximum gmLevel found
List<World> wlist = this.getWorlds();
Pair<Short, List<List<MapleCharacter>>> accCharacters = loadAccountCharactersViewFromDb(accId, wlist.size());
Pair<Short, List<List<Character>>> accCharacters = loadAccountCharactersViewFromDb(accId, wlist.size());
lgnWLock.lock();
try {
List<List<MapleCharacter>> accChars = accCharacters.getRight();
List<List<Character>> accChars = accCharacters.getRight();
accountCharacterCount.put(accId, accCharacters.getLeft());
Set<Integer> chars = accountChars.get(accId);
@@ -1712,10 +1712,10 @@ public class Server {
for (int wid = fromWorldid; wid < wlist.size(); wid++) {
World w = wlist.get(wid);
List<MapleCharacter> wchars = accChars.get(wid);
List<Character> wchars = accChars.get(wid);
w.loadAccountCharactersView(accId, wchars);
for (MapleCharacter chr : wchars) {
for (Character chr : wchars) {
int cid = chr.getId();
if (gmLevel < chr.gmLevel()) {
gmLevel = chr.gmLevel();

26
src/main/java/net/server/channel/Channel.java
View File

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel;
import client.MapleCharacter;
import client.Character;
import config.YamlConfig;
import constants.game.GameConstants;
import net.netty.ChannelServer;
@@ -262,7 +262,7 @@ public final class Channel {
return Server.getInstance().getWorld(world);
}
public void addPlayer(MapleCharacter chr) {
public void addPlayer(Character chr) {
players.addPlayer(chr);
chr.sendPacket(PacketCreator.serverMessage(serverMessage));
}
@@ -275,7 +275,7 @@ public final class Channel {
return players;
}
public boolean removePlayer(MapleCharacter chr) {
public boolean removePlayer(Character chr) {
return players.removePlayer(chr.getId()) != null;
}
@@ -284,7 +284,7 @@ public final class Channel {
}
public void broadcastPacket(Packet packet) {
for (MapleCharacter chr : players.getAllCharacters()) {
for (Character chr : players.getAllCharacters()) {
chr.sendPacket(packet);
}
}
@@ -310,18 +310,18 @@ public final class Channel {
}
public void broadcastGMPacket(Packet packet) {
for (MapleCharacter chr : players.getAllCharacters()) {
for (Character chr : players.getAllCharacters()) {
if (chr.isGM()) {
chr.sendPacket(packet);
}
}
}
public List<MapleCharacter> getPartyMembers(MapleParty party) {
List<MapleCharacter> partym = new ArrayList<>(8);
public List<Character> getPartyMembers(MapleParty party) {
List<Character> partym = new ArrayList<>(8);
for (MaplePartyCharacter partychar : party.getMembers()) {
if (partychar.getChannel() == getId()) {
MapleCharacter chr = getPlayerStorage().getCharacterByName(partychar.getName());
Character chr = getPlayerStorage().getCharacterByName(partychar.getName());
if (chr != null) {
partym.add(chr);
}
@@ -345,7 +345,7 @@ public final class Channel {
private void disconnectAwayPlayers() {
World wserv = getWorldServer();
for (Integer cid : playersAway) {
MapleCharacter chr = wserv.getPlayerStorage().getCharacterById(cid);
Character chr = wserv.getPlayerStorage().getCharacterById(cid);
if (chr != null && chr.isLoggedin()) {
chr.getClient().forceDisconnect();
}
@@ -383,7 +383,7 @@ public final class Channel {
List<Integer> ret = new ArrayList<>(characterIds.length);
PlayerStorage playerStorage = getPlayerStorage();
for (int characterId : characterIds) {
MapleCharacter chr = playerStorage.getCharacterById(characterId);
Character chr = playerStorage.getCharacterById(characterId);
if (chr != null) {
if (chr.getBuddylist().containsVisible(charIdFrom)) {
ret.add(characterId);
@@ -602,7 +602,7 @@ public final class Channel {
}
MapleMap dojoExit = getMapFactory().getMap(925020002);
for(MapleCharacter chr: getMapFactory().getMap(dojoBaseMap + (100 * (stage + i)) + delta).getAllPlayers()) {
for(Character chr: getMapFactory().getMap(dojoBaseMap + (100 * (stage + i)) + delta).getAllPlayers()) {
if(GameConstants.isDojo(chr.getMap().getId())) {
chr.changeMap(dojoExit);
}
@@ -705,7 +705,7 @@ public final class Channel {
Pair<Integer, Integer> coupleId = wserv.getMarriageQueuedCouple(ret);
Pair<Boolean, Set<Integer>> typeGuests = wserv.removeMarriageQueued(ret);
Pair<String, String> couple = new Pair<>(MapleCharacter.getNameById(coupleId.getLeft()), MapleCharacter.getNameById(coupleId.getRight()));
Pair<String, String> couple = new Pair<>(Character.getNameById(coupleId.getLeft()), Character.getNameById(coupleId.getRight()));
wserv.dropMessage(6, couple.getLeft() + " and " + couple.getRight() + "'s wedding is going to be started at " + (cathedral ? "Cathedral" : "Chapel") + " on Channel " + channel + ".");
return new Pair<>(typeGuests.getLeft(), new Pair<>(ret, typeGuests.getRight()));
@@ -945,7 +945,7 @@ public final class Channel {
}
public void dropMessage(int type, String message) {
for (MapleCharacter player : getPlayerStorage().getAllCharacters()) {
for (Character player : getPlayerStorage().getAllCharacters()) {
player.dropMessage(type, message);
}
}

9
src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java
View File

@@ -21,6 +21,7 @@
*/
package net.server.channel.handlers;
import client.Character;
import client.*;
import client.autoban.AutobanFactory;
import client.status.MonsterStatus;
@@ -57,7 +58,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
public int speed = 4;
public Point position = new Point();
public MapleStatEffect getAttackEffect(MapleCharacter chr, Skill theSkill) {
public MapleStatEffect getAttackEffect(Character chr, Skill theSkill) {
Skill mySkill = theSkill;
if (mySkill == null) {
mySkill = SkillFactory.getSkill(skill);
@@ -79,7 +80,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
}
}
protected void applyAttack(AttackInfo attack, final MapleCharacter player, int attackCount) {
protected void applyAttack(AttackInfo attack, final Character player, int attackCount) {
final MapleMap map = player.getMap();
if (map.isOwnershipRestricted(player)) {
return;
@@ -507,7 +508,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
}
}
private static void damageMonsterWithSkill(final MapleCharacter attacker, final MapleMap map, final MapleMonster monster, final int damage, int skillid, int fixedTime) {
private static void damageMonsterWithSkill(final Character attacker, final MapleMap map, final MapleMonster monster, final int damage, int skillid, int fixedTime) {
int animationTime;
if(fixedTime == 0) animationTime = SkillFactory.getSkill(skillid).getAnimationTime();
@@ -524,7 +525,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
}
}
protected AttackInfo parseDamage(InPacket p, MapleCharacter chr, boolean ranged, boolean magic) {
protected AttackInfo parseDamage(InPacket p, Character chr, boolean ranged, boolean magic) {
//2C 00 00 01 91 A1 12 00 A5 57 62 FC E2 75 99 10 00 47 80 01 04 01 C6 CC 02 DD FF 5F 00
AttackInfo ret = new AttackInfo();
p.readByte();

6
src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleFamily;
import client.MapleFamilyEntry;
@@ -52,12 +52,12 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
return;
}
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
int inviterId = p.readInt();
p.readString();
boolean accept = p.readByte() != 0;
// String inviterName = slea.readMapleAsciiString();
MapleCharacter inviter = c.getWorldServer().getPlayerStorage().getCharacterById(inviterId);
Character inviter = c.getWorldServer().getPlayerStorage().getCharacterById(inviterId);
if(inviter != null) {
MapleInviteResult inviteResult = MapleInviteCoordinator.answerInvite(InviteType.FAMILY, c.getPlayer().getId(), c.getPlayer(), accept);
if(inviteResult.result == InviteResult.NOT_FOUND) return; //was never invited. (or expired on server only somehow?)

10
src/main/java/net/server/channel/handlers/AdminCommandHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Inventory;
import client.inventory.InventoryType;
@@ -49,7 +49,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
}
byte mode = p.readByte();
String victim;
MapleCharacter target;
Character target;
switch (mode) {
case 0x00: // Level1~Level8 & Package1~Package2
int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(p.readInt());
@@ -85,7 +85,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
String reason = c.getPlayer().getName() + " used /ban to ban";
target = c.getChannelServer().getPlayerStorage().getCharacterByName(victim);
if (target != null) {
String readableTargetName = MapleCharacter.makeMapleReadable(target.getName());
String readableTargetName = Character.makeMapleReadable(target.getName());
String ip = target.getClient().getRemoteAddress();
reason += readableTargetName + " (IP: " + ip + ")";
if (duration == -1) {
@@ -95,7 +95,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
target.sendPolice(duration, reason, 6000);
}
c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));
} else if (MapleCharacter.ban(victim, reason, false)) {
} else if (Character.ban(victim, reason, false)) {
c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));
} else {
c.sendPacket(PacketCreator.getGMEffect(6, (byte) 1));
@@ -108,7 +108,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
switch (p.readByte()) {
case 0:// /u
StringBuilder sb = new StringBuilder("USERS ON THIS MAP: ");
for (MapleCharacter mc : c.getPlayer().getMap().getCharacters()) {
for (Character mc : c.getPlayer().getMap().getCharacters()) {
sb.append(mc.getName());
sb.append(" ");
}

14
src/main/java/net/server/channel/handlers/AllianceOperationHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -41,7 +41,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleAlliance alliance = null;
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (chr.getGuild() == null) {
c.sendPacket(PacketCreator.enableActions());
@@ -159,7 +159,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
return;
}
int victimid = p.readInt();
MapleCharacter player = Server.getInstance().getWorld(c.getWorld()).getPlayerStorage().getCharacterById(victimid);
Character player = Server.getInstance().getWorld(c.getWorld()).getPlayerStorage().getCharacterById(victimid);
if (player.getAllianceRank() != 2) {
return;
}
@@ -181,7 +181,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
byte byte1 = p.readByte();
//Server.getInstance().allianceMessage(alliance.getId(), sendChangeRank(chr.getGuild().getAllianceId(), chr.getId(), int1, byte1), -1, -1);
MapleCharacter player = Server.getInstance().getWorld(c.getWorld()).getPlayerStorage().getCharacterById(int1);
Character player = Server.getInstance().getWorld(c.getWorld()).getPlayerStorage().getCharacterById(int1);
changePlayerAllianceRank(alliance, player, (byte1 > 0));
break;
@@ -200,9 +200,9 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
alliance.saveToDB();
}
private void changeLeaderAllianceRank(MapleAlliance alliance, MapleCharacter newLeader) {
private void changeLeaderAllianceRank(MapleAlliance alliance, Character newLeader) {
MapleGuildCharacter lmgc = alliance.getLeader();
MapleCharacter leader = newLeader.getWorldServer().getPlayerStorage().getCharacterById(lmgc.getId());
Character leader = newLeader.getWorldServer().getPlayerStorage().getCharacterById(lmgc.getId());
leader.getMGC().setAllianceRank(2);
leader.saveGuildStatus();
@@ -213,7 +213,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
alliance.dropMessage("'" + newLeader.getName() + "' has been appointed as the new head of this Alliance.");
}
private void changePlayerAllianceRank(MapleAlliance alliance, MapleCharacter chr, boolean raise) {
private void changePlayerAllianceRank(MapleAlliance alliance, Character chr, boolean raise) {
int newRank = chr.getAllianceRank() + (raise ? -1 : 1);
if(newRank < 3 || newRank > 5) return;

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.SkillFactory;
import constants.game.GameConstants;
@@ -33,7 +33,7 @@ public class AranComboHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
final MapleCharacter player = c.getPlayer();
final Character player = c.getPlayer();
int skillLevel = player.getSkillLevel(SkillFactory.getSkill(Aran.COMBO_ABILITY));
if (GameConstants.isAran(player.getJob().getId()) && (skillLevel > 0 || player.getJob().getId() == 2000)) {
final long currentTime = currentServerTime();

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -32,7 +32,7 @@ public final class AutoAggroHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (player.isHidden()) return; // Don't auto aggro GM's in hide...
MapleMap map = player.getMap();

12
src/main/java/net/server/channel/handlers/BBSOperationHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -149,7 +149,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
}
private static void editBBSThread(MapleClient client, String title, String text, int icon, int localthreadid) {
MapleCharacter chr = client.getPlayer();
Character chr = client.getPlayer();
if (chr.getGuildId() < 1) {
return;
}
@@ -173,7 +173,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
}
private static void newBBSThread(MapleClient client, String title, String text, int icon, boolean bNotice) {
MapleCharacter chr = client.getPlayer();
Character chr = client.getPlayer();
if (chr.getGuildId() <= 0) {
return;
}
@@ -208,7 +208,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
}
public static void deleteBBSThread(MapleClient client, int localthreadid) {
MapleCharacter mc = client.getPlayer();
Character mc = client.getPlayer();
if (mc.getGuildId() <= 0) {
return;
}
@@ -248,7 +248,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
}
public static void deleteBBSReply(MapleClient client, int replyid) {
MapleCharacter mc = client.getPlayer();
Character mc = client.getPlayer();
if (mc.getGuildId() <= 0) {
return;
}
@@ -293,7 +293,7 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
}
public static void displayThread(MapleClient client, int threadid, boolean bIsThreadIdLocal) {
MapleCharacter mc = client.getPlayer();
Character mc = client.getPlayer();
if (mc.getGuildId() <= 0) {
return;
}

9
src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java
View File

@@ -23,6 +23,7 @@ package net.server.channel.handlers;
import client.*;
import client.BuddyList.BuddyAddResult;
import client.Character;
import client.BuddyList.BuddyOperation;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -78,7 +79,7 @@ public class BuddylistModifyHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
int mode = p.readByte();
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
BuddyList buddylist = player.getBuddylist();
if (mode == 1) { // add
String addName = p.readString();
@@ -96,7 +97,7 @@ public class BuddylistModifyHandler extends AbstractPacketHandler {
World world = c.getWorldServer();
CharacterIdNameBuddyCapacity charWithId;
int channel;
MapleCharacter otherChar = c.getChannelServer().getPlayerStorage().getCharacterByName(addName);
Character otherChar = c.getChannelServer().getPlayerStorage().getCharacterByName(addName);
if (otherChar != null) {
channel = c.getChannel();
charWithId = new CharacterIdNameBuddyCapacity(otherChar.getId(), otherChar.getName(), otherChar.getBuddylist().getCapacity());
@@ -170,7 +171,7 @@ public class BuddylistModifyHandler extends AbstractPacketHandler {
try {
int channel = c.getWorldServer().find(otherCid);//worldInterface.find(otherCid);
String otherName = null;
MapleCharacter otherChar = c.getChannelServer().getPlayerStorage().getCharacterById(otherCid);
Character otherChar = c.getChannelServer().getPlayerStorage().getCharacterById(otherCid);
if (otherChar == null) {
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT name FROM characters WHERE id = ?")) {
@@ -202,7 +203,7 @@ public class BuddylistModifyHandler extends AbstractPacketHandler {
}
private void notifyRemoteChannel(MapleClient c, int remoteChannel, int otherCid, BuddyOperation operation) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (remoteChannel != -1) {
c.getWorldServer().buddyChanged(otherCid, player.getId(), player.getName(), c.getChannel(), operation);
}

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -31,7 +31,7 @@ public final class CancelChairHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
int id = p.readShort();
MapleCharacter mc = c.getPlayer();
Character mc = c.getPlayer();
if (id >= mc.getMap().getSeats()) {
return;

26
src/main/java/net/server/channel/handlers/CashOperationHandler.java
View File

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleRing;
import client.inventory.Equip;
@@ -51,7 +51,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
CashShop cs = chr.getCashShop();
if (!cs.isOpened()) {
@@ -103,7 +103,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
} else if (action == 0x04) {//TODO check for gender
int birthday = p.readInt();
CashItem cItem = CashItemFactory.getItem(p.readInt());
Map<String, String> recipient = MapleCharacter.getCharacterFromDatabase(p.readString());
Map<String, String> recipient = Character.getCharacterFromDatabase(p.readString());
String message = p.readString();
if (!canBuy(chr, cItem, cs.getCash(4)) || message.length() < 1 || message.length() > 73) {
c.enableCSActions();
@@ -128,7 +128,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
} catch (SQLException ex) {
ex.printStackTrace();
}
MapleCharacter receiver = c.getChannelServer().getPlayerStorage().getCharacterByName(recipient.get("name"));
Character receiver = c.getChannelServer().getPlayerStorage().getCharacterByName(recipient.get("name"));
if (receiver != null) receiver.showNote();
} else if (action == 0x05) { // Modify wish list
cs.clearWishList();
@@ -160,7 +160,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.showBoughtInventorySlots(type, chr.getSlots(type)));
c.sendPacket(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots of type " + type + " for player " + MapleCharacter.makeMapleReadable(chr.getName()));
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots of type " + type + " for player " + Character.makeMapleReadable(chr.getName()));
}
} else {
CashItem cItem = CashItemFactory.getItem(p.readInt());
@@ -179,7 +179,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.showBoughtInventorySlots(type, chr.getSlots(type)));
c.sendPacket(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots of type " + type + " for player " + MapleCharacter.makeMapleReadable(chr.getName()));
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots of type " + type + " for player " + Character.makeMapleReadable(chr.getName()));
}
}
} else if (action == 0x07) { // Increase Storage Slots
@@ -204,7 +204,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots()));
c.sendPacket(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots to " + MapleCharacter.makeMapleReadable(chr.getName()) + "'s account.");
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots to " + Character.makeMapleReadable(chr.getName()) + "'s account.");
}
} else {
CashItem cItem = CashItemFactory.getItem(p.readInt());
@@ -226,7 +226,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots()));
c.sendPacket(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots to " + MapleCharacter.makeMapleReadable(chr.getName()) + "'s account.");
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots to " + Character.makeMapleReadable(chr.getName()) + "'s account.");
}
}
} else if (action == 0x08) { // Increase Character Slots
@@ -248,7 +248,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.showBoughtCharacterSlot(c.getCharacterSlots()));
c.sendPacket(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add a character slot to " + MapleCharacter.makeMapleReadable(chr.getName()) + "'s account.");
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add a character slot to " + Character.makeMapleReadable(chr.getName()) + "'s account.");
c.enableCSActions();
return;
}
@@ -305,7 +305,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
String recipientName = p.readString();
String text = p.readString();
CashItem itemRing = CashItemFactory.getItem(SN);
MapleCharacter partner = c.getChannelServer().getPlayerStorage().getCharacterByName(recipientName);
Character partner = c.getChannelServer().getPlayerStorage().getCharacterByName(recipientName);
if (partner == null) {
chr.sendPacket(PacketCreator.serverNotice(1, "The partner you specified cannot be found.\r\nPlease make sure your partner is online and in the same channel."));
} else {
@@ -375,7 +375,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
CashItem itemRing = CashItemFactory.getItem(snID);
String sentTo = p.readString();
String text = p.readString();
MapleCharacter partner = c.getChannelServer().getPlayerStorage().getCharacterByName(sentTo);
Character partner = c.getChannelServer().getPlayerStorage().getCharacterByName(sentTo);
if (partner == null) {
c.sendPacket(PacketCreator.showCashShopMessage((byte)0xBE));
} else {
@@ -412,7 +412,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
if(cItem.getSN() == 50600000 && YamlConfig.config.server.ALLOW_CASHSHOP_NAME_CHANGE) {
p.readString(); //old name
String newName = p.readString();
if(!MapleCharacter.canCreateChar(newName) || chr.getLevel() < 10) { //(longest ban duration isn't tracked currently)
if(!Character.canCreateChar(newName) || chr.getLevel() < 10) { //(longest ban duration isn't tracked currently)
c.sendPacket(PacketCreator.showCashShopMessage((byte)0));
c.enableCSActions();
return;
@@ -482,7 +482,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
return c.checkBirthDate(cal);
}
private static boolean canBuy(MapleCharacter chr, CashItem item, int cash) {
private static boolean canBuy(Character chr, CashItem item, int cash) {
if (item != null && item.isOnSale() && item.getPrice() <= cash) {
FilePrinter.print(FilePrinter.CASHITEM_BOUGHT, chr + " bought " + MapleItemInformationProvider.getInstance().getName(item.getItemId()) + " (SN " + item.getSN() + ") for " + item.getPrice());
return true;

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

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.InventoryType;
import client.inventory.manipulator.InventoryManipulator;
@@ -42,7 +42,7 @@ public final class ChangeMapHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (chr.isChangingMaps() || chr.isBanned()) {
if (chr.isChangingMaps()) {

6
src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -36,8 +36,8 @@ public final class CharInfoRequestHandler extends AbstractPacketHandler {
int cid = p.readInt();
MapleMapObject target = c.getPlayer().getMap().getMapObject(cid);
if (target != null) {
if (target instanceof MapleCharacter) {
MapleCharacter player = (MapleCharacter) target;
if (target instanceof Character) {
Character player = (Character) target;
if(c.getPlayer().getId() != player.getId()) {
player.exportExcludedItems(c);

3
src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java
View File

@@ -21,6 +21,7 @@
*/
package net.server.channel.handlers;
import client.Character;
import client.*;
import config.YamlConfig;
import constants.game.GameConstants;
@@ -38,7 +39,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
/*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);
if(timeElapsed < 300) {

6
src/main/java/net/server/channel/handlers/CouponCodeHandler.java
View File

@@ -23,7 +23,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Item;
import client.inventory.manipulator.InventoryManipulator;
@@ -51,7 +51,7 @@ import java.util.Map.Entry;
*/
public final class CouponCodeHandler extends AbstractPacketHandler {
private static List<Pair<Integer, Pair<Integer, Integer>>> getNXCodeItems(MapleCharacter chr, Connection con, int codeid) throws SQLException {
private static List<Pair<Integer, Pair<Integer, Integer>>> getNXCodeItems(Character chr, Connection con, int codeid) throws SQLException {
Map<Integer, Integer> couponItems = new HashMap<>();
Map<Integer, Integer> couponPoints = new HashMap<>(5);
@@ -111,7 +111,7 @@ public final class CouponCodeHandler extends AbstractPacketHandler {
return ret;
}
private static Pair<Integer, List<Pair<Integer, Pair<Integer, Integer>>>> getNXCodeResult(MapleCharacter chr, String code) {
private static Pair<Integer, List<Pair<Integer, Pair<Integer, Integer>>>> getNXCodeResult(Character chr, String code) {
MapleClient c = chr.getClient();
List<Pair<Integer, Pair<Integer, Integer>>> ret = new LinkedList<>();
try {

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

@@ -22,7 +22,7 @@
package net.server.channel.handlers;
import client.BuffStat;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -38,7 +38,7 @@ public final class DamageSummonHandler extends AbstractPacketHandler {
int damage = p.readInt();
int monsterIdFrom = p.readInt();
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
MapleMapObject mmo = player.getMap().getMapObject(oid);
if(mmo != null && mmo instanceof MapleSummon) {

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

@@ -19,7 +19,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -36,7 +36,7 @@ public final class DenyAllianceRequestHandler extends AbstractPacketHandler {
String inviterName = p.readString();
String guildName = p.readString();
MapleCharacter chr = c.getWorldServer().getPlayerStorage().getCharacterByName(inviterName);
Character chr = c.getWorldServer().getPlayerStorage().getCharacterByName(inviterName);
if (chr != null) {
MapleAlliance alliance = chr.getAlliance();
if (alliance != null) {

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -36,7 +36,7 @@ public final class DenyGuildRequestHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
p.readByte();
MapleCharacter cfrom = c.getWorldServer().getPlayerStorage().getCharacterByName(p.readString());
Character cfrom = c.getWorldServer().getPlayerStorage().getCharacterByName(p.readString());
if (cfrom != null) {
MapleGuild.answerInvitation(c.getPlayer().getId(), c.getPlayer().getName(), cfrom.getGuildId(), false);
}

6
src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -37,9 +37,9 @@ public final class DenyPartyRequestHandler extends AbstractPacketHandler {
p.readByte();
String[] cname = p.readString().split("PS: ");
MapleCharacter cfrom = c.getChannelServer().getPlayerStorage().getCharacterByName(cname[cname.length - 1]);
Character cfrom = c.getChannelServer().getPlayerStorage().getCharacterByName(cname[cname.length - 1]);
if (cfrom != null) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (MapleInviteCoordinator.answerInvite(InviteType.PARTY, chr.getId(), cfrom.getPartyId(), false).result == InviteResult.DENIED) {
chr.updatePartySearchAvailability(chr.getParty() == null);

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -39,7 +39,7 @@ public final class DoorHandler extends AbstractPacketHandler {
int ownerid = p.readInt();
p.readByte(); // specifies if backwarp or not, 1 town to target, 0 target to town
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (chr.isChangingMaps() || chr.isBanned()) {
c.sendPacket(PacketCreator.enableActions());
return;

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

@@ -21,7 +21,7 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -37,7 +37,7 @@ public class EnterCashShopHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
try {
MapleCharacter mc = c.getPlayer();
Character mc = c.getPlayer();
if (mc.cannotEnterCashShop()) {
c.sendPacket(PacketCreator.enableActions());

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Equip;
import client.inventory.Item;
@@ -47,7 +47,7 @@ import java.util.List;
public final class EnterMTSHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if(!chr.isAlive() && YamlConfig.config.server.USE_BUYBACK_SYSTEM) {
BuybackProcessor.processBuyback(c);

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
@@ -30,7 +30,7 @@ import net.packet.InPacket;
public final class FaceExpressionHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
int emote = p.readInt();
if (emote > 7) {

6
src/main/java/net/server/channel/handlers/FamilyAddHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -42,8 +42,8 @@ public final class FamilyAddHandler extends AbstractPacketHandler {
return;
}
String toAdd = p.readString();
MapleCharacter addChr = c.getChannelServer().getPlayerStorage().getCharacterByName(toAdd);
MapleCharacter chr = c.getPlayer();
Character addChr = c.getChannelServer().getPlayerStorage().getCharacterByName(toAdd);
Character chr = c.getPlayer();
if(addChr == null) {
c.sendPacket(PacketCreator.sendFamilyMessage(65, 0));
} else if(addChr == chr) { //only possible through packet editing/client editing i think?

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

@@ -1,6 +1,6 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleFamilyEntitlement;
import client.MapleFamilyEntry;
@@ -23,7 +23,7 @@ public class FamilySummonResponseHandler extends AbstractPacketHandler {
boolean accept = p.readByte() != 0;
MapleInviteResult inviteResult = MapleInviteCoordinator.answerInvite(InviteType.FAMILY_SUMMON, c.getPlayer().getId(), c.getPlayer(), accept);
if(inviteResult.result == InviteResult.NOT_FOUND) return;
MapleCharacter inviter = inviteResult.from;
Character inviter = inviteResult.from;
MapleFamilyEntry inviterEntry = inviter.getFamilyEntry();
if(inviterEntry == null) return;
MapleMap map = (MapleMap) inviteResult.params[0];

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleFamilyEntitlement;
import client.MapleFamilyEntry;
@@ -52,7 +52,7 @@ public final class FamilyUseHandler extends AbstractPacketHandler {
return; // shouldn't even be able to request it
}
c.sendPacket(PacketCreator.getFamilyInfo(entry));
MapleCharacter victim;
Character victim;
if(type == MapleFamilyEntitlement.FAMILY_REUINION || type == MapleFamilyEntitlement.SUMMON_FAMILY) {
victim = c.getChannelServer().getPlayerStorage().getCharacterByName(p.readString());
if(victim != null && victim != c.getPlayer()) {

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

@@ -19,7 +19,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import constants.game.GameConstants;
import net.AbstractPacketHandler;
@@ -37,7 +37,7 @@ public class FieldDamageMobHandler extends AbstractPacketHandler {
int mobOid = p.readInt(); // packet structure found thanks to Darter (Rajan)
int dmg = p.readInt();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleMap map = chr.getMap();
if (map.getEnvironment().isEmpty()) { // no environment objects activated to actually hit the mob

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.processor.npc.FredrickProcessor;
import net.AbstractPacketHandler;
@@ -35,7 +35,7 @@ public class FredrickHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
byte operation = p.readByte();
switch (operation) {

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

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanFactory;
import client.command.CommandsExecutor;
@@ -36,7 +36,7 @@ public final class GeneralChatHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
String s = p.readString();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if(chr.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
c.sendPacket(PacketCreator.enableActions());
return;

8
src/main/java/net/server/channel/handlers/GiveFameHandler.java
View File

@@ -21,8 +21,8 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.MapleCharacter.FameStatus;
import client.Character;
import client.Character.FameStatus;
import client.MapleClient;
import client.autoban.AutobanFactory;
import net.AbstractPacketHandler;
@@ -34,10 +34,10 @@ public final class GiveFameHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter target = (MapleCharacter) c.getPlayer().getMap().getMapObject(p.readInt());
Character target = (Character) c.getPlayer().getMap().getMapObject(p.readInt());
int mode = p.readByte();
int famechange = 2 * mode - 1;
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (target == null || target.getId() == player.getId() || player.getLevel() < 15) {
return;
} else if (famechange != 1 && famechange != -1) {

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

@@ -19,7 +19,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import constants.skills.Gunslinger;
import constants.skills.NightWalker;
@@ -37,7 +37,7 @@ public class GrenadeEffectHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
Point position = new Point(p.readInt(), p.readInt());
int keyDown = p.readInt();
int skillId = p.readInt();

12
src/main/java/net/server/channel/handlers/GuildOperationHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import constants.game.GameConstants;
@@ -46,7 +46,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
return false;
}
for (int i = 0; i < name.length(); i++) {
if (!Character.isLowerCase(name.charAt(i)) && !Character.isUpperCase(name.charAt(i))) {
if (!java.lang.Character.isLowerCase(name.charAt(i)) && !java.lang.Character.isUpperCase(name.charAt(i))) {
return false;
}
}
@@ -55,7 +55,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter mc = c.getPlayer();
Character mc = c.getPlayer();
byte type = p.readByte();
int allianceId = -1;
switch (type) {
@@ -77,7 +77,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
return;
}
Set<MapleCharacter> eligibleMembers = new HashSet<>(MapleGuild.getEligiblePlayersForGuild(mc));
Set<Character> eligibleMembers = new HashSet<>(MapleGuild.getEligiblePlayersForGuild(mc));
if (eligibleMembers.size() < YamlConfig.config.server.CREATE_GUILD_MIN_PARTNERS) {
if (mc.getMap().getAllPlayers().size() < YamlConfig.config.server.CREATE_GUILD_MIN_PARTNERS) {
// thanks NovaStory for noticing message in need of smoother info
@@ -96,7 +96,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
}
Set<Integer> eligibleCids = new HashSet<>();
for (MapleCharacter chr : eligibleMembers) {
for (Character chr : eligibleMembers) {
eligibleCids.add(chr.getId());
}
@@ -256,7 +256,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
if (leaderid != -1) {
boolean result = p.readByte() != 0;
if (result && wserv.getMatchCheckerCoordinator().isMatchConfirmationActive(mc.getId())) {
MapleCharacter leader = wserv.getPlayerStorage().getCharacterById(leaderid);
Character leader = wserv.getPlayerStorage().getCharacterById(leaderid);
if (leader != null) {
int partyid = leader.getPartyId();
if (partyid != -1) {

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

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanFactory;
import client.autoban.AutobanManager;
@@ -34,7 +34,7 @@ import tools.PacketCreator;
public final class HealOvertimeHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if(!chr.isLoggedinWorld()) return;
AutobanManager abm = chr.getAutobanManager();

8
src/main/java/net/server/channel/handlers/HiredMerchantRequest.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.ItemFactory;
import constants.game.GameConstants;
@@ -44,12 +44,12 @@ import java.util.Arrays;
public final class HiredMerchantRequest extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
try {
for (MapleMapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapleMapObjectType.HIRED_MERCHANT, MapleMapObjectType.PLAYER))) {
if (mmo instanceof MapleCharacter) {
MapleCharacter mc = (MapleCharacter) mmo;
if (mmo instanceof Character) {
Character mc = (Character) mmo;
MaplePlayerShop shop = mc.getPlayerShop();
if (shop != null && shop.isOwner(mc)) {

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Inventory;
import client.inventory.InventoryType;
@@ -38,7 +38,7 @@ public final class InventoryMergeHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
p.readInt();
chr.getAutobanManager().setTimestamp(2, Server.getInstance().getCurrentTimestamp(), 4);

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.*;
import config.YamlConfig;
@@ -262,7 +262,7 @@ class PairedQuicksort {
public final class InventorySortHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
p.readInt();
chr.getAutobanManager().setTimestamp(3, Server.getInstance().getCurrentTimestamp(), 4);

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -43,7 +43,7 @@ public final class ItemPickupHandler extends AbstractPacketHandler {
p.readByte();
p.readPos(); //cpos
int oid = p.readInt();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleMapObject ob = chr.getMap().getMapObject(oid);
if(ob == null) return;

6
src/main/java/net/server/channel/handlers/MTSHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Equip;
import client.inventory.InventoryType;
@@ -427,7 +427,7 @@ public final class MTSHandler extends AbstractPacketHandler {
if (c.getPlayer().getCashShop().getCash(4) >= price) { //FIX
boolean alwaysnull = true;
for (Channel cserv : Server.getInstance().getAllChannels()) {
MapleCharacter victim = cserv.getPlayerStorage().getCharacterById(rs.getInt("seller"));
Character victim = cserv.getPlayerStorage().getCharacterById(rs.getInt("seller"));
if (victim != null) {
victim.getCashShop().gainCash(4, rs.getInt("price"));
alwaysnull = false;
@@ -490,7 +490,7 @@ public final class MTSHandler extends AbstractPacketHandler {
int price = rs.getInt("price") + 100 + (int) (rs.getInt("price") * 0.1);
if (c.getPlayer().getCashShop().getCash(4) >= price) {
for (Channel cserv : Server.getInstance().getAllChannels()) {
MapleCharacter victim = cserv.getPlayerStorage().getCharacterById(rs.getInt("seller"));
Character victim = cserv.getPlayerStorage().getCharacterById(rs.getInt("seller"));
if (victim != null) {
victim.getCashShop().gainCash(4, rs.getInt("price"));
} else {

3
src/main/java/net/server/channel/handlers/MagicDamageHandler.java
View File

@@ -21,6 +21,7 @@
*/
package net.server.channel.handlers;
import client.Character;
import client.*;
import config.YamlConfig;
import constants.game.GameConstants;
@@ -36,7 +37,7 @@ import tools.PacketCreator;
public final class MagicDamageHandler extends AbstractDealDamageHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
/*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);
if(timeElapsed < 300) {

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -35,7 +35,7 @@ import tools.PacketCreator;
public final class MesoDropHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (!player.isAlive()) {
c.sendPacket(PacketCreator.enableActions());
return;

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -41,7 +41,7 @@ public final class MessengerHandler extends AbstractPacketHandler {
try {
String input;
byte mode = p.readByte();
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
World world = c.getWorldServer();
MapleMessenger messenger = player.getMessenger();
switch (mode) {
@@ -85,7 +85,7 @@ public final class MessengerHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.messengerChat(player.getName() + " : This Maple Messenger is currently unavailable. Please quit this chat."));
} else if (messenger.getMembers().size() < 3) {
input = p.readString();
MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(input);
Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(input);
if (target != null) {
if (target.getMessenger() == null) {
if (MapleInviteCoordinator.createInvite(InviteType.MESSENGER, c.getPlayer(), messenger.getId(), target.getId())) {

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

@@ -19,7 +19,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -32,7 +32,7 @@ public final class MobBanishPlayerHandler extends AbstractPacketHandler {
public final void handlePacket(InPacket p, MapleClient c) {
int mobid = p.readInt(); // mob banish handling detected thanks to MedicOP
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleMonster mob = chr.getMap().getMonsterById(mobid);
if (mob != null) {

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanFactory;
import client.status.MonsterStatus;
@@ -49,7 +49,7 @@ public final class MobDamageMobHandler extends AbstractPacketHandler {
int to = p.readInt();
boolean magic = p.readByte() == 0;
int dmg = p.readInt();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleMap map = chr.getMap();
MapleMonster attacker = map.getMonsterByOid(from);

6
src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleDisease;
import net.AbstractPacketHandler;
@@ -108,7 +108,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler {
}
if (hitChance <= 80) {
for (MaplePartyCharacter mpc : enemies.getPartyMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
if (dis == null) {
mc.dispel();
@@ -121,7 +121,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler {
} else {
int amount = enemies.getMembers().size() - 1;
int randd = (int) Math.floor(Math.random() * amount);
MapleCharacter chrApp = c.getPlayer().getMap().getCharacterById(enemies.getMemberByPos(randd).getId());
Character chrApp = c.getPlayer().getMap().getCharacterById(enemies.getMemberByPos(randd).getId());
if (chrApp != null && chrApp.getMap().isCPQMap()) {
if (dis == null) {
chrApp.dispel();

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

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.packet.InPacket;
import server.maps.MapleDragon;
@@ -34,7 +34,7 @@ import java.awt.*;
public class MoveDragonHandler extends AbstractMovementPacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
final MapleCharacter chr = c.getPlayer();
final Character chr = c.getPlayer();
final Point startPos = new Point(p.readShort(), p.readShort());
final MapleDragon dragon = chr.getDragon();
if (dragon != null) {

8
src/main/java/net/server/channel/handlers/MoveLifeHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.packet.InPacket;
@@ -50,7 +50,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
MapleMap map = player.getMap();
if (player.isChangingMaps()) { // thanks Lame for noticing mob movement shuffle (mob OID on different maps) happening on map transitions
@@ -65,7 +65,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
}
MapleMonster monster = (MapleMonster) mmo;
List<MapleCharacter> banishPlayers = null;
List<Character> banishPlayers = null;
byte pNibbles = p.readByte();
byte rawActivity = p.readByte();
@@ -172,7 +172,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
} catch (EmptyMovementException e) {}
if (banishPlayers != null) {
for (MapleCharacter chr : banishPlayers) {
for (Character chr : banishPlayers) {
chr.changeMapBanish(monster.getBanish().getMap(), monster.getBanish().getPortal(), monster.getBanish().getMsg());
}
}

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.packet.InPacket;
import server.movement.LifeMovementFragment;
@@ -43,7 +43,7 @@ public final class MovePetHandler extends AbstractMovementPacketHandler {
} catch (EmptyMovementException e) {
return;
}
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
byte slot = player.getPetIndex(petId);
if (slot == -1) {
return;

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.packet.InPacket;
import server.maps.MapleSummon;
@@ -36,7 +36,7 @@ public final class MoveSummonHandler extends AbstractMovementPacketHandler {
public final void handlePacket(InPacket p, MapleClient c) {
int oid = p.readInt();
Point startPos = new Point(p.readShort(), p.readShort());
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
Collection<MapleSummon> summons = player.getSummonsValues();
MapleSummon summon = null;
for (MapleSummon sum : summons) {

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanFactory;
import config.YamlConfig;
@@ -36,7 +36,7 @@ import tools.PacketCreator;
public final class MultiChatHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if(player.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
return;
}

8
src/main/java/net/server/channel/handlers/NewYearCardHandler.java
View File

@@ -19,7 +19,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Item;
import client.newyear.NewYearCardRecord;
@@ -45,7 +45,7 @@ public final class NewYearCardHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
final MapleCharacter player = c.getPlayer();
final Character player = c.getPlayer();
byte reqMode = p.readByte(); //[00] -> NewYearReq (0 = Send)
if(reqMode == 0) { // card has been sent
@@ -107,7 +107,7 @@ public final class NewYearCardHandler extends AbstractPacketHandler {
player.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(player, newyear, 0xD, 0));
MapleCharacter sender = c.getWorldServer().getPlayerStorage().getCharacterById(newyear.getSenderId());
Character sender = c.getWorldServer().getPlayerStorage().getCharacterById(newyear.getSenderId());
if(sender != null && sender.isLoggedinWorld()) {
sender.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(sender, newyear, 0xD, 0));
sender.dropMessage(6, "[New Year] Your addressee successfully received the New Year card.");
@@ -145,7 +145,7 @@ public final class NewYearCardHandler extends AbstractPacketHandler {
return -1;
}
private static int getValidNewYearCardStatus(int itemid, MapleCharacter player, short slot) {
private static int getValidNewYearCardStatus(int itemid, Character player, short slot) {
if(!ItemConstants.isNewYearCardUse(itemid)) return 0x14;
Item it = player.getInventory(ItemConstants.getInventoryType(itemid)).getItem(slot);

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

@@ -19,7 +19,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -34,7 +34,7 @@ public final class OpenFamilyHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
c.sendPacket(PacketCreator.getFamilyInfo(chr.getFamilyEntry()));
}
}

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

@@ -19,7 +19,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -34,7 +34,7 @@ public final class OpenFamilyPedigreeHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(p.readString());
Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(p.readString());
if(target != null && target.getFamily() != null) {
c.sendPacket(PacketCreator.showPedigree(target.getFamilyEntry()));
}

8
src/main/java/net/server/channel/handlers/PartyOperationHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -43,7 +43,7 @@ public final class PartyOperationHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
int operation = p.readByte();
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
World world = c.getWorldServer();
MapleParty party = player.getParty();
switch (operation) {
@@ -53,7 +53,7 @@ public final class PartyOperationHandler extends AbstractPacketHandler {
}
case 2: { // leave/disband
if (party != null) {
List<MapleCharacter> partymembers = player.getPartyMembersOnline();
List<Character> partymembers = player.getPartyMembersOnline();
MapleParty.leaveParty(party, c);
player.updatePartySearchAvailability(true);
@@ -75,7 +75,7 @@ public final class PartyOperationHandler extends AbstractPacketHandler {
}
case 4: { // invite
String name = p.readString();
MapleCharacter invited = world.getPlayerStorage().getCharacterByName(name);
Character invited = world.getPlayerStorage().getCharacterByName(name);
if (invited != null) {
if(invited.getLevel() < 10 && (!YamlConfig.config.server.USE_PARTY_FOR_STARTERS || player.getLevel() >= 10)) { //min requirement is level 10
c.sendPacket(PacketCreator.serverNotice(5, "The player you have invited does not meet the requirements."));

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -41,7 +41,7 @@ public class PartySearchStartHandler extends AbstractPacketHandler {
int min = p.readInt();
int max = p.readInt();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (min > max) {
chr.dropMessage(1, "The min. value is higher than the max!");
c.sendPacket(PacketCreator.enableActions());

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.processor.action.PetAutopotProcessor;
import net.AbstractPacketHandler;
@@ -39,7 +39,7 @@ public final class PetAutoPotHandler extends AbstractPacketHandler {
short slot = p.readShort();
int itemId = p.readInt();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleStatEffect stat = MapleItemInformationProvider.getInstance().getItemEffect(itemId);
if (stat.getHp() > 0 || stat.getHpRate() > 0.0) {
float estimatedHp = ((float) chr.getHp()) / chr.getMaxHp();

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Pet;
import client.inventory.PetCommand;
@@ -35,7 +35,7 @@ public final class PetCommandHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
int petId = p.readInt();
byte petIndex = chr.getPetIndex(petId);
Pet pet;

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanFactory;
import client.inventory.Pet;
@@ -39,7 +39,7 @@ public final class PetExcludeItemsHandler extends AbstractPacketHandler {
final int petId = p.readInt();
p.skip(4); // timestamp
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
byte petIndex = chr.getPetIndex(petId);
if (petIndex < 0) return;

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanManager;
import client.inventory.Inventory;
@@ -38,7 +38,7 @@ public final class PetFoodHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
AutobanManager abm = chr.getAutobanManager();
if (abm.getLastSpam(2) + 500 > currentServerTime()) {
c.sendPacket(PacketCreator.enableActions());

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Pet;
import net.AbstractPacketHandler;
@@ -39,7 +39,7 @@ import java.util.Set;
public final class PetLootHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
int petIndex = chr.getPetIndex(p.readInt());
Pet pet = chr.getPet(petIndex);

18
src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanFactory;
import client.inventory.Inventory;
@@ -109,7 +109,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
}
}
private static int establishMiniroomStatus(MapleCharacter chr, boolean isMinigame) {
private static int establishMiniroomStatus(Character chr, boolean isMinigame) {
if (isMinigame && FieldLimit.CANNOTMINIGAME.check(chr.getMap().getFieldLimit())) {
return 11;
}
@@ -134,7 +134,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
try {
byte mode = p.readByte();
final MapleCharacter chr = c.getPlayer();
final Character chr = c.getPlayer();
if (mode == Action.CREATE.getCode()) {
if(!chr.isAlive()) { // thanks GabrielSin for pointing this
@@ -261,7 +261,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
}
} else if (mode == Action.INVITE.getCode()) {
int otherCid = p.readInt();
MapleCharacter other = chr.getMap().getCharacterById(otherCid);
Character other = chr.getMap().getCharacterById(otherCid);
if (other == null || chr.getId() == other.getId()) {
return;
}
@@ -760,7 +760,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
} else if (mode == Action.EXPEL.getCode()) {
MapleMiniGame miniGame = chr.getMiniGame();
if(miniGame != null && miniGame.isOwner(chr)) {
MapleCharacter visitor = miniGame.getVisitor();
Character visitor = miniGame.getVisitor();
if(visitor != null) {
visitor.closeMiniGame(false);
@@ -783,7 +783,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
}
}
private static boolean isTradeOpen(MapleCharacter chr) {
private static boolean isTradeOpen(Character chr) {
if (chr.getTrade() != null) { // thanks to Rien dev team
//Apparently there is a dupe exploit that causes racing conditions when saving/retrieving from the db with stuff like trade open.
chr.sendPacket(PacketCreator.enableActions());
@@ -793,11 +793,11 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
return false;
}
private static boolean canPlaceStore(MapleCharacter chr) {
private static boolean canPlaceStore(Character chr) {
try {
for (MapleMapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapleMapObjectType.HIRED_MERCHANT, MapleMapObjectType.PLAYER))) {
if (mmo instanceof MapleCharacter) {
MapleCharacter mc = (MapleCharacter) mmo;
if (mmo instanceof Character) {
Character mc = (Character) mmo;
if (mc.getId() == chr.getId()) {
continue;
}

9
src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -21,6 +21,7 @@
*/
package net.server.channel.handlers;
import client.Character;
import client.*;
import client.inventory.*;
import client.keybind.KeyBinding;
@@ -111,7 +112,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
}
}
MapleCharacter player = wserv.getPlayerStorage().getCharacterById(cid);
Character player = wserv.getPlayerStorage().getCharacterById(cid);
final Hwid hwid;
if (player == null) {
@@ -134,7 +135,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
boolean newcomer = false;
if (player == null) {
try {
player = MapleCharacter.loadCharFromDB(cid, c, true);
player = Character.loadCharFromDB(cid, c, true);
newcomer = true;
} catch (SQLException e) {
e.printStackTrace();
@@ -398,7 +399,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
if (player.getPartnerId() > 0) {
int partnerId = player.getPartnerId();
final MapleCharacter partner = wserv.getPlayerStorage().getCharacterById(partnerId);
final Character partner = wserv.getPlayerStorage().getCharacterById(partnerId);
if (partner != null && !partner.isAwayFromWorld()) {
player.sendPacket(WeddingPackets.OnNotifyWeddingPartnerTransfer(partnerId, partner.getMapId()));
@@ -439,7 +440,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
}
}
private static void showDueyNotification(MapleClient c, MapleCharacter player) {
private static void showDueyNotification(MapleClient c, Character player) {
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT Type FROM dueypackages WHERE ReceiverId = ? AND Checked = 1 ORDER BY Type DESC")) {
ps.setInt(1, player.getId());

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

@@ -21,7 +21,7 @@
package net.server.channel.handlers;
import client.BuffStat;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -41,7 +41,7 @@ public final class PlayerMapTransitionHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
chr.setMapTransitionComplete();
int beaconid = chr.getBuffSource(BuffStat.HOMING_BEACON);

6
src/main/java/net/server/channel/handlers/QuestActionHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -38,7 +38,7 @@ import java.awt.*;
public final class QuestActionHandler extends AbstractPacketHandler {
// isNpcNearby thanks to GabrielSin
private static boolean isNpcNearby(InPacket p, MapleCharacter player, MapleQuest quest, int npcId) {
private static boolean isNpcNearby(InPacket p, Character player, MapleQuest quest, int npcId) {
Point playerP;
Point pos = player.getPosition();
@@ -71,7 +71,7 @@ public final class QuestActionHandler extends AbstractPacketHandler {
public final void handlePacket(InPacket p, MapleClient c) {
byte action = p.readByte();
short questid = p.readShort();
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
MapleQuest quest = MapleQuest.getInstance(questid);
if (action == 0) { // Restore lost item, Credits Darter ( Rajan )

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

@@ -1,6 +1,6 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -16,7 +16,7 @@ public final class RPSActionHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c){
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleRockPaperScissor rps = chr.getRPS();
if (c.tryacquireClient()) {

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

@@ -1,6 +1,6 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleQuestStatus;
import client.inventory.Inventory;
@@ -39,7 +39,7 @@ public class RaiseIncExpHandler extends AbstractPacketHandler {
int infoNumber = consItem.questid;
Map<Integer, Integer> consumables = consItem.items;
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleQuest quest = MapleQuest.getInstanceFromInfoNumber(infoNumber);
if (!chr.getQuest(quest).getStatus().equals(MapleQuestStatus.Status.STARTED)) {
c.sendPacket(PacketCreator.enableActions());

6
src/main/java/net/server/channel/handlers/RaiseUIStateHandler.java
View File

@@ -1,7 +1,7 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.MapleCharacter.DelayedQuestUpdate;
import client.Character;
import client.Character.DelayedQuestUpdate;
import client.MapleClient;
import client.MapleQuestStatus;
import net.AbstractPacketHandler;
@@ -21,7 +21,7 @@ public class RaiseUIStateHandler extends AbstractPacketHandler {
if (c.tryacquireClient()) {
try {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleQuest quest = MapleQuest.getInstanceFromInfoNumber(infoNumber);
MapleQuestStatus mqs = chr.getQuest(quest);

3
src/main/java/net/server/channel/handlers/RangedAttackHandler.java
View File

@@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.handlers;
import client.Character;
import client.*;
import client.inventory.Inventory;
import client.inventory.InventoryType;
@@ -43,7 +44,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
/*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);
if(timeElapsed < 300) {

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

@@ -22,7 +22,7 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -36,7 +36,7 @@ import tools.PacketCreator;
public class RemoteStoreHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleHiredMerchant hm = getMerchant(c);
if (hm != null && hm.isOwner(chr)) {
if (hm.getChannel() == chr.getClient().getChannel()) {

6
src/main/java/net/server/channel/handlers/ReportHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -59,7 +59,7 @@ public final class ReportHandler extends AbstractPacketHandler {
return;
}
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(6, victim + " was reported for: " + description));
addReport(c.getPlayer().getId(), MapleCharacter.getIdByName(victim), 0, description, null);
addReport(c.getPlayer().getId(), Character.getIdByName(victim), 0, description, null);
} else if (type == 1) {
String chatlog = p.readString();
if (chatlog == null) {
@@ -75,7 +75,7 @@ public final class ReportHandler extends AbstractPacketHandler {
}
}
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(6, victim + " was reported for: " + description));
addReport(c.getPlayer().getId(), MapleCharacter.getIdByName(victim), reason, description, chatlog);
addReport(c.getPlayer().getId(), Character.getIdByName(victim), reason, description, chatlog);
} else {
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(6, c.getPlayer().getName() + " is probably packet editing. Got unknown report type, which is impossible."));
}

38
src/main/java/net/server/channel/handlers/RingActionHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleRing;
import client.inventory.Equip;
@@ -57,8 +57,8 @@ public final class RingActionHandler extends AbstractPacketHandler {
public static void sendEngageProposal(final MapleClient c, final String name, final int itemid) {
final int newBoxId = getBoxId(itemid);
final MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(name);
final MapleCharacter source = c.getPlayer();
final Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(name);
final Character source = c.getPlayer();
// TODO: get the correct packet bytes for these popups
if (source.isMarried()) {
@@ -171,14 +171,14 @@ public final class RingActionHandler extends AbstractPacketHandler {
}
}
private synchronized static void breakMarriage(MapleCharacter chr) {
private synchronized static void breakMarriage(Character chr) {
int partnerid = chr.getPartnerId();
if(partnerid <= 0) return;
chr.getClient().getWorldServer().deleteRelationship(chr.getId(), partnerid);
MapleRing.removeRing(chr.getMarriageRing());
MapleCharacter partner = chr.getClient().getWorldServer().getPlayerStorage().getCharacterById(partnerid);
Character partner = chr.getClient().getWorldServer().getPlayerStorage().getCharacterById(partnerid);
if(partner == null) {
eraseEngagementOffline(partnerid);
} else {
@@ -192,7 +192,7 @@ public final class RingActionHandler extends AbstractPacketHandler {
partner.addMarriageRing(null);
}
chr.dropMessage(5, "You have successfully break the marriage with " + MapleCharacter.getNameById(partnerid) + ".");
chr.dropMessage(5, "You have successfully break the marriage with " + Character.getNameById(partnerid) + ".");
//chr.sendPacket(Wedding.OnMarriageResult((byte) 0));
chr.sendPacket(WeddingPackets.OnNotifyWeddingPartnerTransfer(0, 0));
@@ -202,7 +202,7 @@ public final class RingActionHandler extends AbstractPacketHandler {
chr.addMarriageRing(null);
}
private static void resetRingId(MapleCharacter player) {
private static void resetRingId(Character player) {
int ringitemid = player.getMarriageRing().getItemId();
Item it = player.getInventory(InventoryType.EQUIP).findById(ringitemid);
@@ -216,13 +216,13 @@ public final class RingActionHandler extends AbstractPacketHandler {
}
}
private synchronized static void breakEngagement(MapleCharacter chr) {
private synchronized static void breakEngagement(Character chr) {
int partnerid = chr.getPartnerId();
int marriageitemid = chr.getMarriageItemId();
chr.getClient().getWorldServer().deleteRelationship(chr.getId(), partnerid);
MapleCharacter partner = chr.getClient().getWorldServer().getPlayerStorage().getCharacterById(partnerid);
Character partner = chr.getClient().getWorldServer().getPlayerStorage().getCharacterById(partnerid);
if(partner == null) {
breakEngagementOffline(partnerid);
} else {
@@ -242,7 +242,7 @@ public final class RingActionHandler extends AbstractPacketHandler {
if(chr.haveItem(marriageitemid)) {
InventoryManipulator.removeById(chr.getClient(), InventoryType.ETC, marriageitemid, (short) 1, false, false);
}
chr.dropMessage(5, "You have successfully break the engagement with " + MapleCharacter.getNameById(partnerid) + ".");
chr.dropMessage(5, "You have successfully break the engagement with " + Character.getNameById(partnerid) + ".");
//chr.sendPacket(Wedding.OnMarriageResult((byte) 0));
chr.sendPacket(WeddingPackets.OnNotifyWeddingPartnerTransfer(0, 0));
@@ -250,7 +250,7 @@ public final class RingActionHandler extends AbstractPacketHandler {
chr.setMarriageItemId(-1);
}
public static void breakMarriageRing(MapleCharacter chr, final int wItemId) {
public static void breakMarriageRing(Character chr, final int wItemId) {
final InventoryType type = InventoryType.getByType((byte) (wItemId / 1000000));
final Item wItem = chr.getInventory(type).findById(wItemId);
final boolean weddingToken = (wItem != null && type == InventoryType.ETC && wItemId / 10000 == 403);
@@ -271,7 +271,7 @@ public final class RingActionHandler extends AbstractPacketHandler {
}
}
public static void giveMarriageRings(MapleCharacter player, MapleCharacter partner, int marriageRingId) {
public static void giveMarriageRings(Character player, Character partner, int marriageRingId) {
Pair<Integer, Integer> rings = MapleRing.createRing(marriageRingId, player, partner);
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
@@ -311,8 +311,8 @@ public final class RingActionHandler extends AbstractPacketHandler {
name = p.readString();
final int id = p.readInt();
final MapleCharacter source = c.getWorldServer().getPlayerStorage().getCharacterByName(name);
final MapleCharacter target = c.getPlayer();
final Character source = c.getWorldServer().getPlayerStorage().getCharacterByName(name);
final Character target = c.getPlayer();
if (source == null) {
target.sendPacket(PacketCreator.enableActions());
@@ -383,8 +383,8 @@ public final class RingActionHandler extends AbstractPacketHandler {
return;
}
String groom = c.getPlayer().getName(), bride = MapleCharacter.getNameById(c.getPlayer().getPartnerId());
int guest = MapleCharacter.getIdByName(name);
String groom = c.getPlayer().getName(), bride = Character.getNameById(c.getPlayer().getPartnerId());
int guest = Character.getIdByName(name);
if (groom == null || bride == null || groom.equals("") || bride.equals("") || guest <= 0) {
c.getPlayer().dropMessage(5, "Unable to find " + name + "!");
return;
@@ -404,7 +404,7 @@ public final class RingActionHandler extends AbstractPacketHandler {
if(resStatus > 0) {
long expiration = cserv.getWeddingTicketExpireTime(resStatus + 1);
MapleCharacter guestChr = c.getWorldServer().getPlayerStorage().getCharacterById(guest);
Character guestChr = c.getWorldServer().getPlayerStorage().getCharacterById(guest);
if(guestChr != null && InventoryManipulator.checkSpace(guestChr.getClient(), newItemId, 1, "") && InventoryManipulator.addById(guestChr.getClient(), newItemId, (short) 1, expiration)) {
guestChr.dropMessage(6, "[Wedding] You've been invited to " + groom + " and " + bride + "'s Wedding!");
} else {
@@ -452,7 +452,7 @@ public final class RingActionHandler extends AbstractPacketHandler {
Pair<Integer, Integer> coupleId = c.getWorldServer().getWeddingCoupleForGuest(c.getPlayer().getId(), invitationid == 4031407);
if (coupleId != null) {
int groomId = coupleId.getLeft(), brideId = coupleId.getRight();
c.sendPacket(WeddingPackets.sendWeddingInvitation(MapleCharacter.getNameById(groomId), MapleCharacter.getNameById(brideId)));
c.sendPacket(WeddingPackets.sendWeddingInvitation(Character.getNameById(groomId), Character.getNameById(brideId)));
}
}
@@ -463,7 +463,7 @@ public final class RingActionHandler extends AbstractPacketHandler {
// By -- Dragoso (Drago)
// Groom and Bride's Wishlist
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
EventInstanceManager eim = player.getEventInstance();
if (eim != null) {

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.Skill;
import client.SkillFactory;
@@ -59,7 +59,7 @@ public final class ScrollHandler extends AbstractPacketHandler {
}
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
Equip toScroll = (Equip) chr.getInventory(InventoryType.EQUIPPED).getItem(dst);
Skill LegendarySpirit = SkillFactory.getSkill(1003);
if (chr.getSkillLevel(LegendarySpirit) > 0 && dst >= 0) {

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.Skill;
import client.SkillFactory;
@@ -53,7 +53,7 @@ public final class SkillBookHandler extends AbstractPacketHandler {
int skill = 0;
int maxlevel = 0;
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (c.tryacquireClient()) {
try {
Inventory inv = c.getPlayer().getInventory(InventoryType.USE);

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.SkillMacro;
import client.autoban.AutobanFactory;
@@ -32,7 +32,7 @@ public final class SkillMacroHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
int num = p.readByte();
if (num > 5) return;

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

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -36,7 +36,7 @@ public final class SnowballHandler extends AbstractPacketHandler {
public void handlePacket(InPacket p, MapleClient c) {
//D3 00 02 00 00 A5 01
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleMap map = chr.getMap();
final MapleSnowball snowball = map.getSnowball(chr.getTeam());
final MapleSnowball othersnowball = map.getSnowball(chr.getTeam() == 0 ? (byte) 1 : 0);

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.Skill;
import client.SkillFactory;
@@ -40,7 +40,7 @@ public final class SpecialMoveHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
p.readInt();
chr.getAutobanManager().setTimestamp(4, Server.getInstance().getCurrentTimestamp(), 28);
int skillid = p.readInt();

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -37,7 +37,7 @@ public final class SpouseChatHandler extends AbstractPacketHandler {
int partnerId = c.getPlayer().getPartnerId();
if (partnerId > 0) { // yay marriage
MapleCharacter spouse = c.getWorldServer().getPlayerStorage().getCharacterById(partnerId);
Character spouse = c.getWorldServer().getPlayerStorage().getCharacterById(partnerId);
if (spouse != null) {
spouse.sendPacket(PacketCreator.OnCoupleMessage(c.getPlayer().getName(), msg, true));
c.sendPacket(PacketCreator.OnCoupleMessage(c.getPlayer().getName(), msg, true));

6
src/main/java/net/server/channel/handlers/SummonDamageHandler.java
View File

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.Skill;
import client.SkillFactory;
@@ -68,7 +68,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
int oid = p.readInt();
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (!player.isAlive()) {
return;
}
@@ -127,7 +127,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler {
}
}
private static int calcMaxDamage(MapleStatEffect summonEffect, MapleCharacter player, boolean magic) {
private static int calcMaxDamage(MapleStatEffect summonEffect, Character player, boolean magic) {
double maxDamage;
if (magic) {

7
src/main/java/net/server/channel/handlers/TakeDamageHandler.java
View File

@@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.handlers;
import client.Character;
import client.*;
import client.inventory.Inventory;
import client.inventory.InventoryType;
@@ -52,9 +53,9 @@ public final class TakeDamageHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
List<MapleCharacter> banishPlayers = new ArrayList<>();
List<Character> banishPlayers = new ArrayList<>();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
p.readInt();
byte damagefrom = p.readByte();
p.readByte(); //Element
@@ -277,7 +278,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.getEnergy("energy", chr.getDojoEnergy()));
}
for (MapleCharacter player : banishPlayers) { // chill, if this list ever gets non-empty an attacker does exist, trust me :)
for (Character player : banishPlayers) { // chill, if this list ever gets non-empty an attacker does exist, trust me :)
player.changeMapBanish(attacker.getBanish().getMap(), attacker.getBanish().getPortal(), attacker.getBanish().getMsg());
}
}

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

@@ -22,14 +22,14 @@
package net.server.channel.handlers;
import client.BuffStat;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.packet.InPacket;
public final class TouchMonsterDamageHandler extends AbstractDealDamageHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (chr.getEnergyBar() == 15000 || chr.getBuffedValue(BuffStat.BODY_PRESSURE) != null) {
applyAttack(parseDamage(p, chr, false, false), c.getPlayer(), 1);
}

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

@@ -20,7 +20,7 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -51,7 +51,7 @@ public final class TransferNameHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.sendNameTransferRules(4));
return;
}
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if(chr.getLevel() < 10) {
c.sendPacket(PacketCreator.sendNameTransferRules(4));
return;

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

@@ -20,7 +20,7 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -35,6 +35,6 @@ public final class TransferNameResultHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
String name = p.readString();
c.sendPacket(PacketCreator.sendNameTransferCheck(name, MapleCharacter.canCreateChar(name)));
c.sendPacket(PacketCreator.sendNameTransferCheck(name, Character.canCreateChar(name)));
}
}

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

@@ -20,7 +20,7 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -47,7 +47,7 @@ public final class TransferWorldHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
return;
}
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if(!YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER || Server.getInstance().getWorldsSize() <= 1) {
c.sendPacket(PacketCreator.sendWorldTransferRules(9, c));
return;

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -36,7 +36,7 @@ public final class TrockAddMapHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
byte type = p.readByte();
boolean vip = p.readByte() == 1;
if (type == 0x00) {

9
src/main/java/net/server/channel/handlers/UseCashItemHandler.java
View File

@@ -21,6 +21,7 @@
*/
package net.server.channel.handlers;
import client.Character;
import client.*;
import client.creator.veteran.*;
import client.inventory.*;
@@ -53,7 +54,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
final MapleCharacter player = c.getPlayer();
final Character player = c.getPlayer();
long timeNow = currentServerTime();
if (timeNow - player.getLastUsedCashItem() < 3000) {
@@ -112,7 +113,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
}
} else {
String name = p.readString();
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(name);
Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(name);
if (victim != null) {
MapleMap targetMap = victim.getMap();
@@ -271,7 +272,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
int tvType = itemId % 10;
boolean megassenger = false;
boolean ear = false;
MapleCharacter victim = null;
Character victim = null;
if (tvType != 1) {
if (tvType >= 3) {
megassenger = true;
@@ -360,7 +361,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
remove(c, position, itemId);
} else if (itemType == 512) {
if (ii.getStateChangeItem(itemId) != 0) {
for (MapleCharacter mChar : player.getMap().getCharacters()) {
for (Character mChar : player.getMap().getCharacters()) {
ii.getItemEffect(ii.getStateChangeItem(itemId)).applyTo(mChar);
}
}

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanManager;
import client.inventory.InventoryType;
@@ -41,7 +41,7 @@ import tools.PacketCreator;
public final class UseCatchItemHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
AutobanManager abm = chr.getAutobanManager();
p.readInt();
abm.setTimestamp(5, Server.getInstance().getCurrentTimestamp(), 4);

6
src/main/java/net/server/channel/handlers/UseItemHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleDisease;
import client.inventory.InventoryType;
@@ -41,7 +41,7 @@ import tools.PacketCreator;
public final class UseItemHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (!chr.isAlive()) {
c.sendPacket(PacketCreator.enableActions());
@@ -99,7 +99,7 @@ public final class UseItemHandler extends AbstractPacketHandler {
ii.getItemEffect(toUse.getItemId()).applyTo(chr);
} else {
MapleStatEffect mse = ii.getItemEffect(toUse.getItemId());
for(MapleCharacter player : chr.getMap().getCharacters()) {
for(Character player : chr.getMap().getCharacters()) {
mse.applyTo(player);
}
}

6
src/main/java/net/server/channel/handlers/UseMapleLifeHandler.java
View File

@@ -19,7 +19,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -32,7 +32,7 @@ import tools.PacketCreator;
public class UseMapleLifeHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
long timeNow = currentServerTime();
if(timeNow - player.getLastUsedCashItem() < 3000) {
@@ -44,7 +44,7 @@ public class UseMapleLifeHandler extends AbstractPacketHandler {
player.setLastUsedCashItem(timeNow);
String name = p.readString();
if(MapleCharacter.canCreateChar(name)) {
if(Character.canCreateChar(name)) {
c.sendPacket(PacketCreator.sendMapleLifeCharacterInfo());
} else {
c.sendPacket(PacketCreator.sendMapleLifeNameError());

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleMount;
import client.inventory.Inventory;
@@ -44,7 +44,7 @@ public final class UseMountFoodHandler extends AbstractPacketHandler {
short pos = p.readShort();
int itemid = p.readInt();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleMount mount = chr.getMount();
Inventory useInv = chr.getInventory(InventoryType.USE);

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

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Inventory;
import client.inventory.InventoryType;
@@ -49,7 +49,7 @@ public final class UseSolomonHandler extends AbstractPacketHandler {
if (c.tryacquireClient()) {
try {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
Inventory inv = chr.getInventory(InventoryType.USE);
inv.lockInventory();
try {

6
src/main/java/net/server/channel/handlers/WeddingHandler.java
View File

@@ -7,7 +7,7 @@
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Inventory;
import client.inventory.InventoryType;
@@ -36,7 +36,7 @@ public final class WeddingHandler extends AbstractPacketHandler {
if (c.tryacquireClient()) {
try {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
final byte mode = p.readByte();
if (mode == 6) { //additem
@@ -54,7 +54,7 @@ public final class WeddingHandler extends AbstractPacketHandler {
if (giftCount < YamlConfig.config.server.WEDDING_GIFT_LIMIT) {
int cid = marriage.getIntProperty(groomWishlist ? "groomId" : "brideId");
if (chr.getId() != cid) { // cannot gift yourself
MapleCharacter spouse = marriage.getPlayerById(cid);
Character spouse = marriage.getPlayerById(cid);
if (spouse != null) {
InventoryType type = ItemConstants.getInventoryType(itemid);
Inventory chrInv = chr.getInventory(type);

8
src/main/java/net/server/channel/handlers/WhisperHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanFactory;
import config.YamlConfig;
@@ -47,7 +47,7 @@ public final class WhisperHandler extends AbstractPacketHandler {
public void handlePacket(InPacket p, MapleClient c) {
byte request = p.readByte();
String name = p.readString();
MapleCharacter target = c.getWorldServer().getPlayerStorage().getCharacterByName(name);
Character target = c.getWorldServer().getPlayerStorage().getCharacterByName(name);
if (target == null) {
c.sendPacket(PacketCreator.getWhisperResult(name, false));
@@ -71,7 +71,7 @@ public final class WhisperHandler extends AbstractPacketHandler {
}
}
private void handleFind(MapleCharacter user, MapleCharacter target, byte flag) {
private void handleFind(Character user, Character target, byte flag) {
if (user.gmLevel() >= target.gmLevel()) {
if (target.getCashShop().isOpened()) {
user.sendPacket(PacketCreator.getFindResult(target, RT_CASH_SHOP, -1, flag));
@@ -86,7 +86,7 @@ public final class WhisperHandler extends AbstractPacketHandler {
}
}
private void handleWhisper(String message, MapleCharacter user, MapleCharacter target) {
private void handleWhisper(String message, Character user, Character target) {
if (user.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
return;
}

4
src/main/java/net/server/coordinator/login/MapleLoginBypassCoordinator.java
View File

@@ -19,7 +19,7 @@
*/
package net.server.coordinator.login;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.server.Server;
@@ -85,7 +85,7 @@ public class MapleLoginBypassCoordinator {
long timeNow = Server.getInstance().getCurrentTime();
for (World w : Server.getInstance().getWorlds()) {
for (MapleCharacter chr : w.getPlayerStorage().getAllCharacters()) {
for (Character chr : w.getPlayerStorage().getAllCharacters()) {
MapleClient c = chr.getClient();
if (c != null) {
onlineAccounts.add(c.getAccID());

10
src/main/java/net/server/coordinator/matchchecker/AbstractMatchCheckerListener.java
View File

@@ -19,7 +19,7 @@
*/
package net.server.coordinator.matchchecker;
import client.MapleCharacter;
import client.Character;
import java.util.Set;
@@ -28,8 +28,8 @@ import java.util.Set;
* @author Ronan
*/
public interface AbstractMatchCheckerListener {
void onMatchCreated(MapleCharacter leader, Set<MapleCharacter> nonLeaderMatchPlayers, String message);
void onMatchAccepted(int leaderid, Set<MapleCharacter> matchPlayers, String message);
void onMatchDeclined(int leaderid, Set<MapleCharacter> matchPlayers, String message);
void onMatchDismissed(int leaderid, Set<MapleCharacter> matchPlayers, String message);
void onMatchCreated(Character leader, Set<Character> nonLeaderMatchPlayers, String message);
void onMatchAccepted(int leaderid, Set<Character> matchPlayers, String message);
void onMatchDeclined(int leaderid, Set<Character> matchPlayers, String message);
void onMatchDismissed(int leaderid, Set<Character> matchPlayers, String message);
}

22
src/main/java/net/server/coordinator/matchchecker/MapleMatchCheckerCoordinator.java
View File

@@ -19,18 +19,14 @@
*/
package net.server.coordinator.matchchecker;
import client.MapleCharacter;
import client.Character;
import net.server.PlayerStorage;
import net.server.Server;
import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType;
import net.server.world.World;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.Semaphore;
/**
@@ -133,15 +129,15 @@ public class MapleMatchCheckerCoordinator {
return s;
}
private Set<MapleCharacter> getMatchCharacters() {
Set<MapleCharacter> players = new HashSet<>();
private Set<Character> getMatchCharacters() {
Set<Character> players = new HashSet<>();
World wserv = Server.getInstance().getWorld(world);
if (wserv != null) {
PlayerStorage ps = wserv.getPlayerStorage();
for (Integer cid : getMatchPlayers()) {
MapleCharacter chr = ps.getCharacterById(cid);
Character chr = ps.getCharacterById(cid);
if (chr != null) {
players.add(chr);
}
@@ -152,10 +148,10 @@ public class MapleMatchCheckerCoordinator {
}
private void dispatchMatchCreated() {
Set<MapleCharacter> nonLeaderMatchPlayers = getMatchCharacters();
MapleCharacter leader = null;
Set<Character> nonLeaderMatchPlayers = getMatchCharacters();
Character leader = null;
for (MapleCharacter chr : nonLeaderMatchPlayers) {
for (Character chr : nonLeaderMatchPlayers) {
if (chr.getId() == leaderCid) {
leader = chr;
break;

37
src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerCPQChallenge.java
View File

@@ -19,17 +19,18 @@
*/
package net.server.coordinator.matchchecker.listener;
import client.MapleCharacter;
import client.Character;
import constants.string.LanguageConstants;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import net.server.coordinator.matchchecker.AbstractMatchCheckerListener;
import net.server.coordinator.matchchecker.MatchCheckerListenerRecipe;
import net.server.world.MaplePartyCharacter;
import scripting.npc.NPCConversationManager;
import scripting.npc.NPCScriptManager;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
/**
*
* @author Ronan
@@ -40,9 +41,9 @@ public class MatchCheckerCPQChallenge implements MatchCheckerListenerRecipe {
return (new MatchCheckerCPQChallenge()).getListener();
}
private static MapleCharacter getChallenger(int leaderid, Set<MapleCharacter> matchPlayers) {
MapleCharacter leader = null;
for (MapleCharacter chr : matchPlayers) {
private static Character getChallenger(int leaderid, Set<Character> matchPlayers) {
Character leader = null;
for (Character chr : matchPlayers) {
if (chr.getId() == leaderid && chr.getClient() != null) {
leader = chr;
break;
@@ -57,17 +58,17 @@ public class MatchCheckerCPQChallenge implements MatchCheckerListenerRecipe {
return new AbstractMatchCheckerListener() {
@Override
public void onMatchCreated(MapleCharacter leader, Set<MapleCharacter> nonLeaderMatchPlayers, String message) {
public void onMatchCreated(Character leader, Set<Character> nonLeaderMatchPlayers, String message) {
NPCConversationManager cm = leader.getClient().getCM();
int npcid = cm.getNpc();
MapleCharacter ldr = null;
for (MapleCharacter chr : nonLeaderMatchPlayers) {
Character ldr = null;
for (Character chr : nonLeaderMatchPlayers) {
ldr = chr;
break;
}
MapleCharacter chr = leader;
Character chr = leader;
List<MaplePartyCharacter> chrMembers = new LinkedList<>();
for (MaplePartyCharacter mpc : chr.getParty().getMembers()) {
@@ -86,11 +87,11 @@ public class MatchCheckerCPQChallenge implements MatchCheckerListenerRecipe {
}
@Override
public void onMatchAccepted(int leaderid, Set<MapleCharacter> matchPlayers, String message) {
MapleCharacter chr = getChallenger(leaderid, matchPlayers);
public void onMatchAccepted(int leaderid, Set<Character> matchPlayers, String message) {
Character chr = getChallenger(leaderid, matchPlayers);
MapleCharacter ldr = null;
for (MapleCharacter ch : matchPlayers) {
Character ldr = null;
for (Character ch : matchPlayers) {
if (ch != chr) {
ldr = ch;
break;
@@ -109,13 +110,13 @@ public class MatchCheckerCPQChallenge implements MatchCheckerListenerRecipe {
}
@Override
public void onMatchDeclined(int leaderid, Set<MapleCharacter> matchPlayers, String message) {
MapleCharacter chr = getChallenger(leaderid, matchPlayers);
public void onMatchDeclined(int leaderid, Set<Character> matchPlayers, String message) {
Character chr = getChallenger(leaderid, matchPlayers);
chr.dropMessage(5, LanguageConstants.getMessage(chr, LanguageConstants.CPQChallengeRoomDenied));
}
@Override
public void onMatchDismissed(int leaderid, Set<MapleCharacter> matchPlayers, String message) {}
public void onMatchDismissed(int leaderid, Set<Character> matchPlayers, String message) {}
};
}
}

32
src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java
View File

@@ -19,7 +19,7 @@
*/
package net.server.coordinator.matchchecker.listener;
import client.MapleCharacter;
import client.Character;
import config.YamlConfig;
import constants.game.GameConstants;
import net.packet.Packet;
@@ -39,8 +39,8 @@ import java.util.Set;
*/
public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe {
private static void broadcastGuildCreationDismiss(Set<MapleCharacter> nonLeaderMatchPlayers) {
for (MapleCharacter chr : nonLeaderMatchPlayers) {
private static void broadcastGuildCreationDismiss(Set<Character> nonLeaderMatchPlayers) {
for (Character chr : nonLeaderMatchPlayers) {
if (chr.isLoggedinWorld()) {
chr.sendPacket(GuildPackets.genericGuildMessage((byte) 0x26));
}
@@ -56,10 +56,10 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe {
return new AbstractMatchCheckerListener() {
@Override
public void onMatchCreated(MapleCharacter leader, Set<MapleCharacter> nonLeaderMatchPlayers, String message) {
public void onMatchCreated(Character leader, Set<Character> nonLeaderMatchPlayers, String message) {
Packet createGuildPacket = GuildPackets.createGuildMessage(leader.getName(), message);
for (MapleCharacter chr : nonLeaderMatchPlayers) {
for (Character chr : nonLeaderMatchPlayers) {
if (chr.isLoggedinWorld()) {
chr.sendPacket(createGuildPacket);
}
@@ -67,9 +67,9 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe {
}
@Override
public void onMatchAccepted(int leaderid, Set<MapleCharacter> matchPlayers, String message) {
MapleCharacter leader = null;
for (MapleCharacter chr : matchPlayers) {
public void onMatchAccepted(int leaderid, Set<Character> matchPlayers, String message) {
Character leader = null;
for (Character chr : matchPlayers) {
if (chr.getId() == leaderid) {
leader = chr;
break;
@@ -98,7 +98,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe {
broadcastGuildCreationDismiss(matchPlayers);
return;
}
for (MapleCharacter chr : matchPlayers) {
for (Character chr : matchPlayers) {
if (leader.getMap().getCharacterById(chr.getId()) == null) {
leader.dropMessage(1, "You cannot establish the creation of a new Guild if one of the members is not present here.");
broadcastGuildCreationDismiss(matchPlayers);
@@ -126,7 +126,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe {
leader.sendPacket(GuildPackets.showGuildInfo(leader));
leader.dropMessage(1, "You have successfully created a Guild.");
for (MapleCharacter chr : matchPlayers) {
for (Character chr : matchPlayers) {
boolean cofounder = chr.getPartyId() == partyid;
MapleGuildCharacter mgc = chr.getMGC();
@@ -154,8 +154,8 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe {
}
@Override
public void onMatchDeclined(int leaderid, Set<MapleCharacter> matchPlayers, String message) {
for (MapleCharacter chr : matchPlayers) {
public void onMatchDeclined(int leaderid, Set<Character> matchPlayers, String message) {
for (Character chr : matchPlayers) {
if (chr.getId() == leaderid && chr.getClient() != null) {
MapleParty.leaveParty(chr.getParty(), chr.getClient());
}
@@ -167,10 +167,10 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe {
}
@Override
public void onMatchDismissed(int leaderid, Set<MapleCharacter> matchPlayers, String message) {
public void onMatchDismissed(int leaderid, Set<Character> matchPlayers, String message) {
MapleCharacter leader = null;
for (MapleCharacter chr : matchPlayers) {
Character leader = null;
for (Character chr : matchPlayers) {
if (chr.getId() == leaderid) {
leader = chr;
break;
@@ -184,7 +184,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe {
msg = "The Guild creation has been dismissed since a member was already in a party when they answered.";
}
for (MapleCharacter chr : matchPlayers) {
for (Character chr : matchPlayers) {
if (chr.getId() == leaderid && chr.getClient() != null) {
MapleParty.leaveParty(chr.getParty(), chr.getClient());
}

64
src/main/java/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java
View File

@@ -19,7 +19,7 @@
*/
package net.server.coordinator.partysearch;
import client.MapleCharacter;
import client.Character;
import client.MapleJob;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
@@ -50,15 +50,15 @@ public class MaplePartySearchCoordinator {
private Map<MapleJob, PartySearchStorage> storage = new HashMap<>();
private Map<MapleJob, PartySearchEchelon> upcomers = new HashMap<>();
private List<MapleCharacter> leaderQueue = new LinkedList<>();
private List<Character> leaderQueue = new LinkedList<>();
private final MonitoredReentrantReadWriteLock leaderQueueLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_PARTY_SEARCH_QUEUE, true);
private final MonitoredReadLock leaderQueueRLock = MonitoredReadLockFactory.createLock(leaderQueueLock);
private final MonitoredWriteLock leaderQueueWLock = MonitoredWriteLockFactory.createLock(leaderQueueLock);
private Map<Integer, MapleCharacter> searchLeaders = new HashMap<>();
private Map<Integer, Character> searchLeaders = new HashMap<>();
private Map<Integer, LeaderSearchMetadata> searchSettings = new HashMap<>();
private Map<MapleCharacter, LeaderSearchMetadata> timeoutLeaders = new HashMap<>();
private Map<Character, LeaderSearchMetadata> timeoutLeaders = new HashMap<>();
private int updateCount = 0;
@@ -183,11 +183,11 @@ public class MaplePartySearchCoordinator {
}
}
public void attachPlayer(MapleCharacter chr) {
public void attachPlayer(Character chr) {
upcomers.get(getPartySearchJob(chr.getJob())).attachPlayer(chr);
}
public void detachPlayer(MapleCharacter chr) {
public void detachPlayer(Character chr) {
MapleJob psJob = getPartySearchJob(chr.getJob());
if (!upcomers.get(psJob).detachPlayer(chr)) {
@@ -213,11 +213,11 @@ public class MaplePartySearchCoordinator {
}
}
private MapleCharacter fetchPlayer(int callerCid, int callerMapid, MapleJob job, int minLevel, int maxLevel) {
private Character fetchPlayer(int callerCid, int callerMapid, MapleJob job, int minLevel, int maxLevel) {
return storage.get(getPartySearchJob(job)).callPlayer(callerCid, callerMapid, minLevel, maxLevel);
}
private void addQueueLeader(MapleCharacter leader) {
private void addQueueLeader(Character leader) {
leaderQueueRLock.lock();
try {
leaderQueue.add(leader);
@@ -226,7 +226,7 @@ public class MaplePartySearchCoordinator {
}
}
private void removeQueueLeader(MapleCharacter leader) {
private void removeQueueLeader(Character leader) {
leaderQueueRLock.lock();
try {
leaderQueue.remove(leader);
@@ -235,7 +235,7 @@ public class MaplePartySearchCoordinator {
}
}
public void registerPartyLeader(MapleCharacter leader, int minLevel, int maxLevel, int jobs) {
public void registerPartyLeader(Character leader, int minLevel, int maxLevel, int jobs) {
if (searchLeaders.containsKey(leader.getId())) return;
searchSettings.put(leader.getId(), new LeaderSearchMetadata(minLevel, maxLevel, jobs));
@@ -243,7 +243,7 @@ public class MaplePartySearchCoordinator {
addQueueLeader(leader);
}
private void registerPartyLeader(MapleCharacter leader, LeaderSearchMetadata settings) {
private void registerPartyLeader(Character leader, LeaderSearchMetadata settings) {
if (searchLeaders.containsKey(leader.getId())) return;
searchSettings.put(leader.getId(), settings);
@@ -251,8 +251,8 @@ public class MaplePartySearchCoordinator {
addQueueLeader(leader);
}
public void unregisterPartyLeader(MapleCharacter leader) {
MapleCharacter toRemove = searchLeaders.remove(leader.getId());
public void unregisterPartyLeader(Character leader) {
Character toRemove = searchLeaders.remove(leader.getId());
if (toRemove != null) {
removeQueueLeader(toRemove);
searchSettings.remove(leader.getId());
@@ -261,7 +261,7 @@ public class MaplePartySearchCoordinator {
}
}
private MapleCharacter searchPlayer(MapleCharacter leader) {
private Character searchPlayer(Character leader) {
LeaderSearchMetadata settings = searchSettings.get(leader.getId());
if (settings != null) {
int minLevel = settings.minLevel, maxLevel = settings.maxLevel;
@@ -270,7 +270,7 @@ public class MaplePartySearchCoordinator {
int leaderCid = leader.getId();
int leaderMapid = leader.getMapId();
for (MapleJob searchJob : settings.searchedJobs) {
MapleCharacter chr = fetchPlayer(leaderCid, leaderMapid, searchJob, minLevel, maxLevel);
Character chr = fetchPlayer(leaderCid, leaderMapid, searchJob, minLevel, maxLevel);
if (chr != null) {
return chr;
}
@@ -280,7 +280,7 @@ public class MaplePartySearchCoordinator {
return null;
}
private boolean sendPartyInviteFromSearch(MapleCharacter chr, MapleCharacter leader) {
private boolean sendPartyInviteFromSearch(Character chr, Character leader) {
if (chr == null) {
return false;
}
@@ -299,8 +299,8 @@ public class MaplePartySearchCoordinator {
}
}
private Pair<List<MapleCharacter>, List<MapleCharacter>> fetchQueuedLeaders() {
List<MapleCharacter> queuedLeaders, nextLeaders;
private Pair<List<Character>, List<Character>> fetchQueuedLeaders() {
List<Character> queuedLeaders, nextLeaders;
leaderQueueWLock.lock();
try {
@@ -315,10 +315,10 @@ public class MaplePartySearchCoordinator {
return new Pair<>(queuedLeaders, nextLeaders);
}
private void registerLongTermPartyLeaders(List<Pair<MapleCharacter, LeaderSearchMetadata>> recycledLeaders) {
private void registerLongTermPartyLeaders(List<Pair<Character, LeaderSearchMetadata>> recycledLeaders) {
leaderQueueRLock.lock();
try {
for (Pair<MapleCharacter, LeaderSearchMetadata> p : recycledLeaders) {
for (Pair<Character, LeaderSearchMetadata> p : recycledLeaders) {
timeoutLeaders.put(p.getLeft(), p.getRight());
}
} finally {
@@ -326,7 +326,7 @@ public class MaplePartySearchCoordinator {
}
}
private void unregisterLongTermPartyLeader(MapleCharacter leader) {
private void unregisterLongTermPartyLeader(Character leader) {
leaderQueueRLock.lock();
try {
timeoutLeaders.remove(leader);
@@ -336,7 +336,7 @@ public class MaplePartySearchCoordinator {
}
private void reinstateLongTermPartyLeaders() {
Map<MapleCharacter, LeaderSearchMetadata> timeoutLeadersCopy;
Map<Character, LeaderSearchMetadata> timeoutLeadersCopy;
leaderQueueWLock.lock();
try {
timeoutLeadersCopy = new HashMap<>(timeoutLeaders);
@@ -345,20 +345,20 @@ public class MaplePartySearchCoordinator {
leaderQueueWLock.unlock();
}
for (Entry<MapleCharacter, LeaderSearchMetadata> e : timeoutLeadersCopy.entrySet()) {
for (Entry<Character, LeaderSearchMetadata> e : timeoutLeadersCopy.entrySet()) {
registerPartyLeader(e.getKey(), e.getValue());
}
}
public void runPartySearch() {
Pair<List<MapleCharacter>, List<MapleCharacter>> queuedLeaders = fetchQueuedLeaders();
Pair<List<Character>, List<Character>> queuedLeaders = fetchQueuedLeaders();
List<MapleCharacter> searchedLeaders = new LinkedList<>();
List<MapleCharacter> recalledLeaders = new LinkedList<>();
List<MapleCharacter> expiredLeaders = new LinkedList<>();
List<Character> searchedLeaders = new LinkedList<>();
List<Character> recalledLeaders = new LinkedList<>();
List<Character> expiredLeaders = new LinkedList<>();
for (MapleCharacter leader : queuedLeaders.getLeft()) {
MapleCharacter chr = searchPlayer(leader);
for (Character leader : queuedLeaders.getLeft()) {
Character chr = searchPlayer(leader);
if (sendPartyInviteFromSearch(chr, leader)) {
searchedLeaders.add(leader);
} else {
@@ -388,7 +388,7 @@ public class MaplePartySearchCoordinator {
leaderQueueRLock.unlock();
}
for (MapleCharacter leader : searchedLeaders) {
for (Character leader : searchedLeaders) {
MapleParty party = leader.getParty();
if (party != null && party.getMembers().size() < 6) {
addQueueLeader(leader);
@@ -399,8 +399,8 @@ public class MaplePartySearchCoordinator {
}
}
List<Pair<MapleCharacter, LeaderSearchMetadata>> recycledLeaders = new LinkedList<>();
for (MapleCharacter leader : expiredLeaders) {
List<Pair<Character, LeaderSearchMetadata>> recycledLeaders = new LinkedList<>();
for (Character leader : expiredLeaders) {
searchLeaders.remove(leader.getId());
LeaderSearchMetadata settings = searchSettings.remove(leader.getId());

Some files were not shown because too many files have changed in this diff Show More