duckietm/Arcturus-Morningstar-Extended
1
0
Fork 0
mirror of https://github.com/duckietm/Arcturus-Morningstar-Extended.git synced 2026-06-19 15:06:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #266 from simoleo89/fix/room-items-picked-owner

Browse Source 
fix(room-items): restore picked item owner
This commit is contained in:
DuckieTM
2026-06-18 12:53:41 +02:00
committed by GitHub
parent 39168c27c8 4f2a5999e4
commit 518957ddde
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
+1 -1
View File
@@ -877,7 +877,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
return;
}
Habbo habbo = (picker != null && picker.getHabboInfo().getId() == item.getId() ? picker
Habbo habbo = (picker != null && picker.getHabboInfo().getId() == item.getUserId() ? picker
: Emulator.getGameServer().getGameClientManager().getHabbo(item.getUserId()));
if (!trackedBuildersClubItem && habbo != null) {
habbo.getInventory().getItemsComponent().addItem(item);
Emulator/src/test/java/com/eu/habbo/habbohotel/rooms/RoomPickupOwnershipContractTest.java
+21
View File
@@ -0,0 +1,21 @@
package com.eu.habbo.habbohotel.rooms;
import org.junit.jupiter.api.Test;
import java.nio.file.Files;
import java.nio.file.Path;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class RoomPickupOwnershipContractTest {
@Test
void pickupReturnsItemToPickerWhenPickerOwnsTheItem() throws Exception {
String source = Files.readString(Path.of("src/main/java/com/eu/habbo/habbohotel/rooms/Room.java"));
assertTrue(source.contains("picker.getHabboInfo().getId() == item.getUserId()"),
"Room.pickUpItem should compare the picker id against the item owner id");
assertFalse(source.contains("picker.getHabboInfo().getId() == item.getId()"),
"Room.pickUpItem must not compare user ids against furniture item ids");
}
}