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

8
src/main/java/client/processor/npc/DueyProcessor.java
View File

@@ -23,7 +23,7 @@
*/
package client.processor.npc;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanFactory;
import client.inventory.Inventory;
@@ -106,7 +106,7 @@ public class DueyProcessor {
return ids;
}
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 SenderName, Type FROM dueypackages WHERE ReceiverId = ? AND Checked = 1 ORDER BY Type DESC")) {
@@ -167,7 +167,7 @@ public class DueyProcessor {
}
}
private static List<DueyPackage> loadPackages(MapleCharacter chr) {
private static List<DueyPackage> loadPackages(Character chr) {
List<DueyPackage> packages = new LinkedList<>();
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT * FROM dueypackages dp WHERE ReceiverId = ?")) {
@@ -348,7 +348,7 @@ public class DueyProcessor {
if (channel > -1) {
Channel rcserv = c.getWorldServer().getChannel(channel);
if (rcserv != null) {
MapleCharacter rChr = rcserv.getPlayerStorage().getCharacterByName(recipient);
Character rChr = rcserv.getPlayerStorage().getCharacterByName(recipient);
if (rChr != null) {
rClient = rChr.getClient();
}

12
src/main/java/client/processor/npc/FredrickProcessor.java
View File

@@ -23,7 +23,7 @@
*/
package client.processor.npc;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Inventory;
import client.inventory.InventoryType;
@@ -52,7 +52,7 @@ public class FredrickProcessor {
private static int[] dailyReminders = new int[]{2, 5, 10, 15, 30, 60, 90, Integer.MAX_VALUE};
private static byte canRetrieveFromFredrick(MapleCharacter chr, List<Pair<Item, InventoryType>> items) {
private static byte canRetrieveFromFredrick(Character chr, List<Pair<Item, InventoryType>> items) {
if (!Inventory.checkSpotsAndOwnership(chr, items)) {
List<Integer> itemids = new LinkedList<>();
for (Pair<Item, InventoryType> it : items) {
@@ -132,7 +132,7 @@ public class FredrickProcessor {
private static void removeFredrickReminders(List<Pair<Integer, Integer>> expiredCids) {
List<String> expiredCnames = new LinkedList<>();
for (Pair<Integer, Integer> id : expiredCids) {
String name = MapleCharacter.getNameById(id.getLeft());
String name = Character.getNameById(id.getLeft());
if (name != null) {
expiredCnames.add(name);
}
@@ -209,7 +209,7 @@ public class FredrickProcessor {
World wserv = Server.getInstance().getWorld(cid.getRight());
if (wserv != null) {
MapleCharacter chr = wserv.getPlayerStorage().getCharacterById(cid.getLeft());
Character chr = wserv.getPlayerStorage().getCharacterById(cid.getLeft());
if (chr != null) {
chr.setMerchantMeso(0);
}
@@ -239,7 +239,7 @@ public class FredrickProcessor {
ps.addBatch();
String msg = fredrickReminderMessage(cid.getRight() - 1);
MapleCharacter.sendNote(cid.getLeft().getRight(), "FREDRICK", msg, (byte) 0);
Character.sendNote(cid.getLeft().getRight(), "FREDRICK", msg, (byte) 0);
}
ps.executeBatch();
@@ -267,7 +267,7 @@ public class FredrickProcessor {
public static void fredrickRetrieveItems(MapleClient c) { // thanks Gustav for pointing out the dupe on Fredrick handling
if (c.tryacquireClient()) {
try {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
List<Pair<Item, InventoryType>> items;
try {

4
src/main/java/client/processor/npc/StorageProcessor.java
View File

@@ -21,7 +21,7 @@
*/
package client.processor.npc;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.autoban.AutobanFactory;
import client.inventory.Inventory;
@@ -46,7 +46,7 @@ public class StorageProcessor {
public static void storageAction(InPacket p, MapleClient c) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
MapleStorage storage = chr.getStorage();
byte mode = p.readByte();