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

6
src/main/java/scripting/npc/NPCConversationManager.java
View File

@@ -40,6 +40,8 @@ import net.server.guild.Guild;
import net.server.guild.GuildPackets;
import net.server.world.Party;
import net.server.world.PartyCharacter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import provider.Data;
import provider.DataProviderFactory;
import provider.wz.WZFiles;
@@ -61,7 +63,6 @@ import server.partyquest.AriantColiseum;
import server.partyquest.MonsterCarnival;
import server.partyquest.Pyramid;
import server.partyquest.Pyramid.PyramidMode;
import tools.FilePrinter;
import tools.PacketCreator;
import tools.packets.WeddingPackets;
@@ -76,6 +77,7 @@ import static java.util.concurrent.TimeUnit.MINUTES;
* @author Matze
*/
public class NPCConversationManager extends AbstractPlayerInteraction {
private static final Logger log = LoggerFactory.getLogger(NPCConversationManager.class);
private final int npc;
private int npcOid;
@@ -380,7 +382,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
if (shop != null) {
shop.sendShop(c);
} else { // check for missing shopids thanks to resinate
FilePrinter.printError(FilePrinter.NPC_UNCODED, "Shop ID: " + id + " is missing from database.");
log.warn("Shop ID: {} is missing from database.", id);
ShopFactory.getInstance().getShop(11000).sendShop(c);
}
}

5
src/main/java/scripting/quest/QuestScriptManager.java
View File

@@ -28,7 +28,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scripting.AbstractScriptManager;
import server.quest.Quest;
import tools.FilePrinter;
import javax.script.Invocable;
import javax.script.ScriptEngine;
@@ -75,7 +74,7 @@ public class QuestScriptManager extends AbstractScriptManager {
ScriptEngine engine = getQuestScriptEngine(c, questid);
if (engine == null) {
FilePrinter.printError(FilePrinter.QUEST_UNCODED, "START Quest " + questid + " is uncoded.");
log.warn("START Quest {} is uncoded.", questid);
qm.dispose();
return;
}
@@ -127,7 +126,7 @@ public class QuestScriptManager extends AbstractScriptManager {
ScriptEngine engine = getQuestScriptEngine(c, questid);
if (engine == null) {
FilePrinter.printError(FilePrinter.QUEST_UNCODED, "END Quest " + questid + " is uncoded.");
log.warn("END Quest {} is uncoded.", questid);
qm.dispose();
return;
}