mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-04 07:17:26 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved support for picking up and dropping items

Browse Source 
ItemController interface changed to be an engine-operable interface
Removed ItemController interface from CharData
Changed ItemController#groundToCursor(Item) to #groundToCursor(int) to pick up an item wrapper entity
ItemManager now handles item entity creation/deletion (may change)
ClientItemManager changed to operate upon Riiablo.charData and is for clients
CursorMovementSystem now uses ItemController instead of handling item drop and packeting directly
Item wrapper entity deletion remains unhandled in multiplayer until support for networking entity deletion is added
This commit is contained in:
Collin Smith
2020-06-02 20:55:03 -07:00
parent edb6de8df9
commit 907688a1d2
8 changed files with 88 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/d2gs/src/com/riiablo/server/d2gs/D2GS.java
View File

@ -65,6 +65,7 @@ import com.riiablo.net.packet.d2gs.CursorToStore;
import com.riiablo.net.packet.d2gs.D2GSData;
import com.riiablo.net.packet.d2gs.Disconnect;
import com.riiablo.net.packet.d2gs.DropItem;
import com.riiablo.net.packet.d2gs.GroundToCursor;
import com.riiablo.net.packet.d2gs.StoreToCursor;
import com.riiablo.net.packet.d2gs.SwapBeltItem;
import com.riiablo.net.packet.d2gs.SwapBodyItem;
@ -387,10 +388,10 @@ public class D2GS extends ApplicationAdapter {
Synchronize(packet);
break;
case D2GSData.DropItem:
DropItem(packet);
// DropItem(packet);
break;
case D2GSData.PickupItem:
PickupItem(packet);
// PickupItem(packet);
break;
case D2GSData.GroundToCursor:
GroundToCursor(packet);
@ -535,6 +536,7 @@ public class D2GS extends ApplicationAdapter {
sync.sync(entityId, packet.data);
}
@Deprecated
private void DropItem(Packet packet) {
int entityId = player.get(packet.id, Engine.INVALID_ENTITY);
assert entityId != Engine.INVALID_ENTITY;
@ -551,6 +553,7 @@ public class D2GS extends ApplicationAdapter {
factory.createItem(item, position);
}
@Deprecated
private void PickupItem(Packet packet) {
}
@ -562,7 +565,12 @@ public class D2GS extends ApplicationAdapter {
}
private void GroundToCursor(Packet packet) {
// TODO: implement
int entityId = getPlayerEntityId(packet);
GroundToCursor groundToCursor = (GroundToCursor) packet.data.data(new GroundToCursor());
itemManager.groundToCursor(entityId, groundToCursor.itemId());
packet.id = (1 << packet.id);
outPackets.offer(packet);
}
private void CursorToGround(Packet packet) {