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

Rename and clean up MaplePlayerShop

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:35:14 +02:00
parent 4cb15ab99d
commit f1ca5991c6
7 changed files with 145 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,8 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapObject;
import server.maps.MapObjectType;
import server.maps.MaplePlayerShop;
import server.maps.MaplePortal;
import server.maps.PlayerShop;
import tools.PacketCreator;
import java.awt.*;
@@ -51,7 +51,7 @@ public final class HiredMerchantRequest extends AbstractPacketHandler {
if (mmo instanceof Character) {
Character mc = (Character) mmo;
MaplePlayerShop shop = mc.getPlayerShop();
PlayerShop shop = mc.getPlayerShop();
if (shop != null && shop.isOwner(mc)) {
chr.sendPacket(PacketCreator.getMiniRoomError(13));
return;

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

@@ -24,7 +24,7 @@ import constants.game.GameConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.HiredMerchant;
import server.maps.MaplePlayerShop;
import server.maps.PlayerShop;
import tools.PacketCreator;
/*
@@ -43,7 +43,7 @@ public final class OwlWarpHandler extends AbstractPacketHandler {
}
HiredMerchant hm = c.getWorldServer().getHiredMerchant(ownerid); // if both hired merchant and player shop is on the same map
MaplePlayerShop ps;
PlayerShop ps;
if(hm == null || hm.getMapId() != mapid || !hm.hasItem(c.getPlayer().getOwlSearch())) {
ps = c.getWorldServer().getPlayerShop(ownerid);
if(ps == null || ps.getMapId() != mapid || !ps.hasItem(c.getPlayer().getOwlSearch())) {

20
src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -245,7 +245,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
}
if (ItemConstants.isPlayerShop(itemId)) {
MaplePlayerShop shop = new MaplePlayerShop(chr, desc, itemId);
PlayerShop shop = new PlayerShop(chr, desc, itemId);
chr.setPlayerShop(shop);
chr.getMap().addMapObject(shop);
shop.sendShop(c);
@@ -282,8 +282,8 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
int oid = p.readInt();
MapObject ob = chr.getMap().getMapObject(oid);
if (ob instanceof MaplePlayerShop) {
MaplePlayerShop shop = (MaplePlayerShop) ob;
if (ob instanceof PlayerShop) {
PlayerShop shop = (PlayerShop) ob;
shop.visitShop(chr);
} else if (ob instanceof MiniGame) {
p.skip(1);
@@ -318,7 +318,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
if (chr.getTrade() != null) {
chr.getTrade().chat(p.readString());
} else if (chr.getPlayerShop() != null) { //mini game
MaplePlayerShop shop = chr.getPlayerShop();
PlayerShop shop = chr.getPlayerShop();
if (shop != null) {
shop.chat(c, p.readString());
}
@@ -358,7 +358,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
return;
}
MaplePlayerShop shop = chr.getPlayerShop();
PlayerShop shop = chr.getPlayerShop();
HiredMerchant merchant = chr.getHiredMerchant();
if (shop != null && shop.isOwner(chr)) {
if(YamlConfig.config.server.USE_ERASE_PERMIT_ON_OPENSHOP) {
@@ -600,7 +600,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
}
MaplePlayerShopItem shopItem = new MaplePlayerShopItem(sellItem, bundles, price);
MaplePlayerShop shop = chr.getPlayerShop();
PlayerShop shop = chr.getPlayerShop();
HiredMerchant merchant = chr.getHiredMerchant();
if (shop != null && shop.isOwner(chr)) {
if (shop.isOpen() || !shop.addItem(shopItem)) { // thanks Vcoc for pointing an exploit with unlimited shop slots
@@ -649,7 +649,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
} else if (mode == Action.REMOVE_ITEM.getCode()) {
if (isTradeOpen(chr)) return;
MaplePlayerShop shop = chr.getPlayerShop();
PlayerShop shop = chr.getPlayerShop();
if (shop != null && shop.isOwner(chr)) {
if (shop.isOpen()) {
c.sendPacket(PacketCreator.serverNotice(1, "You can't take it with the store open."));
@@ -695,7 +695,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
c.disconnect(true, false);
return;
}
MaplePlayerShop shop = chr.getPlayerShop();
PlayerShop shop = chr.getPlayerShop();
HiredMerchant merchant = chr.getHiredMerchant();
if (shop != null && shop.isVisitor(chr)) {
if (shop.buy(c, itemid, quantity)) {
@@ -753,7 +753,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
} else if (mode == Action.BAN_PLAYER.getCode()) {
p.skip(1);
MaplePlayerShop shop = chr.getPlayerShop();
PlayerShop shop = chr.getPlayerShop();
if (shop != null && shop.isOwner(chr)) {
shop.banPlayer(p.readString());
}
@@ -802,7 +802,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
continue;
}
MaplePlayerShop shop = mc.getPlayerShop();
PlayerShop shop = mc.getPlayerShop();
if (shop != null && shop.isOwner(mc)) {
chr.sendPacket(PacketCreator.getMiniRoomError(13));
return false;

14
src/main/java/net/server/world/World.java
View File

@@ -129,7 +129,7 @@ public class World {
private long mountUpdate;
private MonitoredReentrantLock activePlayerShopsLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.WORLD_PSHOPS, true);
private Map<Integer, MaplePlayerShop> activePlayerShops = new LinkedHashMap<>();
private Map<Integer, PlayerShop> activePlayerShops = new LinkedHashMap<>();
private MonitoredReentrantLock activeMerchantsLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.WORLD_MERCHS, true);
private Map<Integer, Pair<HiredMerchant, Integer>> activeMerchants = new LinkedHashMap<>();
@@ -1516,7 +1516,7 @@ public class World {
}
}
public void registerPlayerShop(MaplePlayerShop ps) {
public void registerPlayerShop(PlayerShop ps) {
activePlayerShopsLock.lock();
try {
activePlayerShops.put(ps.getOwner().getId(), ps);
@@ -1525,7 +1525,7 @@ public class World {
}
}
public void unregisterPlayerShop(MaplePlayerShop ps) {
public void unregisterPlayerShop(PlayerShop ps) {
activePlayerShopsLock.lock();
try {
activePlayerShops.remove(ps.getOwner().getId());
@@ -1534,8 +1534,8 @@ public class World {
}
}
public List<MaplePlayerShop> getActivePlayerShops() {
List<MaplePlayerShop> psList = new ArrayList<>();
public List<PlayerShop> getActivePlayerShops() {
List<PlayerShop> psList = new ArrayList<>();
activePlayerShopsLock.lock();
try {
psList.addAll(activePlayerShops.values());
@@ -1546,7 +1546,7 @@ public class World {
}
}
public MaplePlayerShop getPlayerShop(int ownerid) {
public PlayerShop getPlayerShop(int ownerid) {
activePlayerShopsLock.lock();
try {
return activePlayerShops.get(ownerid);
@@ -1824,7 +1824,7 @@ public class World {
}
}
for (MaplePlayerShop ps : getActivePlayerShops()) {
for (PlayerShop ps : getActivePlayerShops()) {
List<MaplePlayerShopItem> itemBundles = ps.sendAvailableBundles(itemid);
for(MaplePlayerShopItem mpsi : itemBundles) {