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

Reformat and clean up "net" package

Browse Source
This commit is contained in:
P0nk
2021-09-09 23:26:02 +02:00
parent 69f4580637
commit 6be6ea9927
235 changed files with 3556 additions and 3398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/net/server/channel/handlers/InventoryMergeHandler.java
View File

@@ -41,37 +41,45 @@ public final class InventoryMergeHandler extends AbstractPacketHandler {
Character chr = c.getPlayer();
p.readInt();
chr.getAutobanManager().setTimestamp(2, Server.getInstance().getCurrentTimestamp(), 4);
if(!YamlConfig.config.server.USE_ITEM_SORT) {
if (!YamlConfig.config.server.USE_ITEM_SORT) {
c.sendPacket(PacketCreator.enableActions());
return;
}
}
byte invType = p.readByte();
if (invType < 1 || invType > 5) {
c.disconnect(false, false);
return;
}
InventoryType inventoryType = InventoryType.getByType(invType);
Inventory inventory = c.getPlayer().getInventory(inventoryType);
Inventory inventory = c.getPlayer().getInventory(inventoryType);
inventory.lockInventory();
try {
//------------------- RonanLana's SLOT MERGER -----------------
ItemInformationProvider ii = ItemInformationProvider.getInstance();
Item srcItem, dstItem;
for(short dst = 1; dst <= inventory.getSlotLimit(); dst++) {
for (short dst = 1; dst <= inventory.getSlotLimit(); dst++) {
dstItem = inventory.getItem(dst);
if(dstItem == null) continue;
if (dstItem == null) {
continue;
}
for(short src = (short)(dst + 1); src <= inventory.getSlotLimit(); src++) {
for (short src = (short) (dst + 1); src <= inventory.getSlotLimit(); src++) {
srcItem = inventory.getItem(src);
if(srcItem == null) continue;
if (srcItem == null) {
continue;
}
if(dstItem.getItemId() != srcItem.getItemId()) continue;
if(dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) break;
if (dstItem.getItemId() != srcItem.getItemId()) {
continue;
}
if (dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) {
break;
}
InventoryManipulator.move(c, inventoryType, src, dst);
}
@@ -105,7 +113,7 @@ public final class InventoryMergeHandler extends AbstractPacketHandler {
} finally {
inventory.unlockInventory();
}
c.sendPacket(PacketCreator.finishedSort(inventoryType.getType()));
c.sendPacket(PacketCreator.enableActions());
}