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

Rename and clean up MapleMapItem

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:26:48 +02:00
parent 0d13686f07
commit 46842f9890
8 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/client/Character.java
View File

@@ -1501,14 +1501,14 @@ public class Character extends AbstractCharacterObject {
}
MapleMap map = this.getMap();
List<MapleMapItem> partyItems = null;
List<MapItem> partyItems = null;
int partyId = exPartyMembers != null ? -1 : this.getPartyId();
for (WeakReference<MapleMap> mapRef : mapids) {
MapleMap mapObj = mapRef.get();
if (mapObj != null) {
List<MapleMapItem> partyMapItems = mapObj.updatePlayerItemDropsToParty(partyId, id, partyMembers, partyLeaver);
List<MapItem> partyMapItems = mapObj.updatePlayerItemDropsToParty(partyId, id, partyMembers, partyLeaver);
if (map.hashCode() == mapObj.hashCode()) {
partyItems = partyMapItems;
}
@@ -1911,13 +1911,13 @@ public class Character extends AbstractCharacterObject {
pickupItem(ob, -1);
}
public final void pickupItem(MapleMapObject ob, int petIndex) { // yes, one picks the MapleMapObject, not the MapleMapItem
public final void pickupItem(MapleMapObject ob, int petIndex) { // yes, one picks the MapleMapObject, not the MapItem
if (ob == null) { // pet index refers to the one picking up the item
return;
}
if (ob instanceof MapleMapItem) {
MapleMapItem mapitem = (MapleMapItem) ob;
if (ob instanceof MapItem) {
MapItem mapitem = (MapItem) ob;
if (System.currentTimeMillis() - mapitem.getDropTime() < 400 || !mapitem.canBePickedBy(this)) {
sendPacket(PacketCreator.enableActions());
return;

4
src/main/java/client/command/commands/gm2/LootCommand.java
View File

@@ -25,7 +25,7 @@ package client.command.commands.gm2;
import client.Client;
import client.command.Command;
import server.maps.MapleMapItem;
import server.maps.MapItem;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
@@ -42,7 +42,7 @@ public class LootCommand extends Command {
public void execute(Client c, String[] params) {
List<MapleMapObject> items = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
for (MapleMapObject item : items) {
MapleMapItem mapItem = (MapleMapItem) item;
MapItem mapItem = (MapItem) item;
if (mapItem.getOwnerId() == c.getPlayer().getId() || mapItem.getOwnerId() == c.getPlayer().getPartyId()) {
c.getPlayer().pickupItem(mapItem);
}

4
src/main/java/client/command/commands/gm4/ForceVacCommand.java
View File

@@ -28,7 +28,7 @@ import client.Client;
import client.command.Command;
import client.inventory.Pet;
import client.inventory.manipulator.InventoryManipulator;
import server.maps.MapleMapItem;
import server.maps.MapItem;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import tools.PacketCreator;
@@ -46,7 +46,7 @@ public class ForceVacCommand extends Command {
Character player = c.getPlayer();
List<MapleMapObject> items = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
for (MapleMapObject item : items) {
MapleMapItem mapItem = (MapleMapItem) item;
MapItem mapItem = (MapItem) item;
mapItem.lockItem();
try {