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

Rename and clean up MapleInventory

Browse Source
This commit is contained in:
P0nk
2021-09-07 08:00:14 +02:00
parent 8e0ab2f9f9
commit 1b945bca10
34 changed files with 260 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/server/MapleMarriage.java
View File

@@ -21,9 +21,9 @@ package server;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.Inventory;
import client.inventory.Item;
import client.inventory.ItemFactory;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import scripting.event.EventInstanceManager;
@@ -118,7 +118,7 @@ public class MapleMarriage extends EventInstanceManager {
public static boolean claimGiftItems(MapleClient c, MapleCharacter chr) {
List<Item> gifts = loadGiftItemsFromDb(c, chr.getId());
if (MapleInventory.checkSpot(chr, gifts)) {
if (Inventory.checkSpot(chr, gifts)) {
try (Connection con = DatabaseConnection.getConnection()) {
ItemFactory.MARRIAGE_GIFTS.saveItems(new LinkedList<>(), chr.getId(), con);
} catch (SQLException sqle) {