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

Instantiate shops in ShopFactory

Browse Source
This commit is contained in:
P0nk
2023-03-29 21:59:00 +02:00
parent 2139147dcd
commit fe9dd75a23
5 changed files with 70 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ import database.maker.MakerDao;
import database.maker.MakerInfoProvider;
import database.migration.FlywayRunner;
import database.note.NoteDao;
import database.shop.ShopDao;
import net.ChannelDependencies;
import net.PacketProcessor;
import net.netty.LoginServer;
@@ -978,7 +979,7 @@ public class Server {
MakerProcessor makerProcessor = new MakerProcessor(new MakerInfoProvider(new MakerDao(connection)));
FredrickProcessor fredrickProcessor = new FredrickProcessor(noteService);
DropProvider dropProvider = new DropProvider(new DropDao(connection));
ShopFactory shopFactory = new ShopFactory();
ShopFactory shopFactory = new ShopFactory(new ShopDao(connection));
CommandContext commandContext = new CommandContext(dropProvider, shopFactory);
CommandsExecutor commandsExecutor = new CommandsExecutor(commandContext);
ChannelDependencies channelDependencies = new ChannelDependencies(noteService, fredrickProcessor,

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

@@ -106,11 +106,11 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
}
private boolean hasShop(NPC npc) {
return shopFactory.getShopForNPC(npc.getId()) != null;
return shopFactory.getShop(npc.getId()) != null;
}
private void sendShop(NPC npc, Client c) {
Shop shop = shopFactory.getShopForNPC(npc.getId());
Shop shop = shopFactory.getShop(npc.getId());
if (shop == null) {
return;
}