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

Inject ShopFactory

Browse Source
This commit is contained in:
P0nk
2023-03-29 20:51:31 +02:00
parent 705efb4340
commit c71ca7f4d5
10 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/net/server/channel/handlers/NPCTalkHandler.java
View File

@@ -30,6 +30,8 @@ import net.packet.InPacket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scripting.npc.NPCScriptManager;
import server.Shop;
import server.ShopFactory;
import server.life.NPC;
import server.life.PlayerNPC;
import server.maps.MapObject;
@@ -37,6 +39,11 @@ import tools.PacketCreator;
public final class NPCTalkHandler extends AbstractPacketHandler {
private static final Logger log = LoggerFactory.getLogger(NPCTalkHandler.class);
private final ShopFactory shopFactory;
public NPCTalkHandler(ShopFactory shopFactory) {
this.shopFactory = shopFactory;
}
@Override
public void handlePacket(InPacket p, Client c) {
@@ -75,7 +82,7 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
} else {
boolean hasNpcScript = NPCScriptManager.getInstance().start(c, npc.getId(), oid, null);
if (!hasNpcScript) {
if (!npc.hasShop()) {
if (!hasShop(npc)) {
log.warn("NPC {} ({}) is not coded", npc.getName(), npc.getId());
return;
} else if (c.getPlayer().getShop() != null) {
@@ -83,7 +90,7 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
return;
}
npc.sendShop(c);
sendShop(npc, c);
}
}
}
@@ -97,4 +104,16 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
}
}
}
}
private boolean hasShop(NPC npc) {
return shopFactory.getShopForNPC(npc.getId()) != null;
}
private void sendShop(NPC npc, Client c) {
Shop shop = shopFactory.getShopForNPC(npc.getId());
if (shop == null) {
return;
}
shop.sendShop(c);
}
}

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

@@ -60,11 +60,14 @@ import static java.util.concurrent.TimeUnit.SECONDS;
public final class UseCashItemHandler extends AbstractPacketHandler {
private static final Logger log = LoggerFactory.getLogger(UseCashItemHandler.class);
private static final int MIU_MIU_SHOP_ID = 1338;
private final NoteService noteService;
private final ShopFactory shopFactory;
public UseCashItemHandler(NoteService noteService) {
public UseCashItemHandler(NoteService noteService, ShopFactory shopFactory) {
this.noteService = noteService;
this.shopFactory = shopFactory;
}
@Override
@@ -508,7 +511,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
}
} else if (itemType == 545) { // MiuMiu's travel store
if (player.getShop() == null) {
Shop shop = ShopFactory.getInstance().getShop(1338);
Shop shop = shopFactory.getShop(MIU_MIU_SHOP_ID);
if (shop != null) {
shop.sendShop(c);
remove(c, position, itemId);