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

fix(pets): require item owner for pet consumables

Browse Source
This commit is contained in:
simoleo89
2026-06-17 21:42:28 +02:00
parent 0109c25c80
commit ece9a214db
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemEvent.java
+7 -6
View File
@@ -32,6 +32,12 @@ public class PetUseItemEvent extends MessageHandler {
int petId = this.packet.readInt();
Pet pet = this.client.getHabbo().getHabboInfo().getCurrentRoom().getPet(petId);
if (pet == null
|| item.getUserId() != this.client.getHabbo().getHabboInfo().getId()
|| pet.getUserId() != this.client.getHabbo().getHabboInfo().getId()) {
return;
}
if (pet instanceof HorsePet) {
if (item.getBaseItem().getName().toLowerCase().startsWith("horse_dye")) {
int race = Integer.parseInt(item.getBaseItem().getName().split("_")[2]);
@@ -89,11 +95,6 @@ public class PetUseItemEvent extends MessageHandler {
Emulator.getGameEnvironment().getItemManager().deleteItem(item);
}
} else if (pet instanceof MonsterplantPet) {
// Validate ownership - only owner can use items on their plant
if (pet.getUserId() != this.client.getHabbo().getHabboInfo().getId()) {
return;
}
MonsterplantPet monsterplant = (MonsterplantPet) pet;
if (item.getBaseItem().getName().equalsIgnoreCase("mnstr_revival")) {
@@ -165,4 +166,4 @@ public class PetUseItemEvent extends MessageHandler {
}
}
}
}
}
Emulator/src/test/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemOwnershipContractTest.java
+25
View File
@@ -0,0 +1,25 @@
package com.eu.habbo.messages.incoming.rooms.pets;
import org.junit.jupiter.api.Test;
import java.nio.file.Files;
import java.nio.file.Path;
import static org.junit.jupiter.api.Assertions.assertTrue;
class PetUseItemOwnershipContractTest {
@Test
void validatesItemAndPetOwnershipBeforeHorseMutations() throws Exception {
String source = Files.readString(Path.of("src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemEvent.java"));
int petLookup = source.indexOf("Pet pet = this.client.getHabbo().getHabboInfo().getCurrentRoom().getPet(petId)");
int ownershipGuard = source.indexOf("item.getUserId() != this.client.getHabbo().getHabboInfo().getId()", petLookup);
int petGuard = source.indexOf("pet.getUserId() != this.client.getHabbo().getHabboInfo().getId()", ownershipGuard);
int horseBranch = source.indexOf("if (pet instanceof HorsePet)", petGuard);
assertTrue(petLookup > -1, "PetUseItemEvent should resolve the target pet");
assertTrue(ownershipGuard > petLookup, "PetUseItemEvent must require ownership of the consumable item");
assertTrue(petGuard > ownershipGuard, "PetUseItemEvent must require ownership of the target pet");
assertTrue(horseBranch > petGuard, "Ownership checks must run before horse item mutations");
}
}