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

Migrate last set of calls to FilePrinter, delete FilePrinter

Browse Source
This commit is contained in:
P0nk
2022-02-10 19:48:02 +01:00
parent 8b630f7357
commit c879e36a9c
36 changed files with 174 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/server/ItemInformationProvider.java
View File

@@ -33,6 +33,8 @@ import constants.skills.Assassin;
import constants.skills.Gunslinger;
import constants.skills.NightWalker;
import net.server.Server;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import provider.*;
import provider.wz.WZFiles;
import server.MakerItemFactory.MakerItemCreateEntry;
@@ -51,6 +53,7 @@ import java.util.Map.Entry;
* @author Matze
*/
public class ItemInformationProvider {
private static final Logger log = LoggerFactory.getLogger(ItemInformationProvider.class);
private final static ItemInformationProvider instance = new ItemInformationProvider();
public static ItemInformationProvider getInstance() {
@@ -1799,7 +1802,7 @@ public class ItemInformationProvider {
String itemName = ItemInformationProvider.getInstance().getName(equip.getItemId());
Server.getInstance().broadcastGMMessage(chr.getWorld(), PacketCreator.sendYellowTip("[Warning]: " + chr.getName() + " tried to equip " + itemName + " into slot " + dst + "."));
AutobanFactory.PACKET_EDIT.alert(chr, chr.getName() + " tried to forcibly equip an item.");
FilePrinter.printError(FilePrinter.EXPLOITS + chr.getName() + ".txt", chr.getName() + " tried to equip " + itemName + " into " + dst + " slot.");
log.warn("Chr {} tried to equip {} into slot {}", chr.getName(), itemName, dst);
return false;
}

9
src/main/java/server/maps/MapleMap.java
View File

@@ -53,6 +53,8 @@ import net.server.services.task.channel.OverallService;
import net.server.services.type.ChannelServices;
import net.server.world.Party;
import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scripting.event.EventInstanceManager;
import scripting.map.MapScriptManager;
import server.ItemInformationProvider;
@@ -64,7 +66,6 @@ import server.life.LifeFactory.selfDestruction;
import server.partyquest.CarnivalFactory;
import server.partyquest.CarnivalFactory.MCSkill;
import server.partyquest.GuardianSpawnPoint;
import tools.FilePrinter;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -83,7 +84,7 @@ import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
public class MapleMap {
private static final Logger log = LoggerFactory.getLogger(MapleMap.class);
private static final List<MapObjectType> rangedMapobjectTypes = Arrays.asList(MapObjectType.SHOP, MapObjectType.ITEM, MapObjectType.NPC, MapObjectType.MONSTER, MapObjectType.DOOR, MapObjectType.SUMMON, MapObjectType.REACTOR);
private static final Map<Integer, Pair<Integer, Integer>> dropBoundsCache = new HashMap<>(100);
@@ -1985,7 +1986,7 @@ public class MapleMap {
} else if (monster.getId() == MobId.GIANT_SNOWMAN_LV5_EASY || monster.getId() == MobId.GIANT_SNOWMAN_LV5_MEDIUM || monster.getId() == MobId.GIANT_SNOWMAN_LV5_HARD) {
monsterItemDrop(monster, monster.getDropPeriodTime());
} else {
FilePrinter.printError(FilePrinter.UNHANDLED_EVENT, "UNCODED TIMED MOB DETECTED: " + monster.getId());
log.error("UNCODED TIMED MOB DETECTED: {}", monster.getId());
}
}
@@ -2059,7 +2060,7 @@ public class MapleMap {
public Portal getDoorPortal(int doorid) {
Portal doorPortal = portals.get(0x80 + doorid);
if (doorPortal == null) {
FilePrinter.printError(FilePrinter.EXCEPTION, "[Door] " + mapName + "(" + mapid + ") does not contain door portalid " + doorid);
log.warn("[Door] {} ({}) does not contain door portalid {}", mapName, mapid, doorid);
return portals.get(0x80);
}

7
src/main/java/server/partyquest/PartyQuest.java
View File

@@ -26,7 +26,8 @@ import client.Character;
import net.server.Server;
import net.server.world.Party;
import net.server.world.PartyCharacter;
import tools.FilePrinter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
@@ -35,6 +36,8 @@ import java.util.List;
* @author kevintjuh93
*/
public class PartyQuest {
private static final Logger log = LoggerFactory.getLogger(PartyQuest.class);
int channel, world;
Party party;
List<Character> participants = new ArrayList<>();
@@ -108,7 +111,7 @@ public class PartyQuest {
} else if (PQ.equals("LudiPQLast")) {
return 800 * level / 5;
}
FilePrinter.printError(FilePrinter.NPC, "Unhandled PartyQuest: " + PQ);
log.warn("Unhandled PartyQuest: {}", PQ);
return 0;
}
}