Merge branch 'fix-pets-finally' into 'fix-pets-finally'

# Conflicts:
#   src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnitStatus.java

src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java

@@ -133,6 +133,7 @@ public class ItemManager {
         this.interactionsList.add(new ItemInteraction("pet_drink", InteractionPetDrink.class));
         this.interactionsList.add(new ItemInteraction("pet_food", InteractionPetFood.class));
         this.interactionsList.add(new ItemInteraction("pet_toy", InteractionPetToy.class));
+        this.interactionsList.add(new ItemInteraction("pet_tree", InteractionPetTree.class));
         this.interactionsList.add(new ItemInteraction("breeding_nest", InteractionPetBreedingNest.class));
         this.interactionsList.add(new ItemInteraction("obstacle", InteractionObstacle.class));
         this.interactionsList.add(new ItemInteraction("monsterplant_seed", InteractionMonsterPlantSeed.class));

src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWater.java

@@ -48,16 +48,19 @@ public class InteractionWater extends InteractionDefault {
         for (Habbo habbo : room.getHabbosOnItem(this)) {
             try {
                 this.onWalkOff(habbo.getRoomUnit(), room, empty);
-            } catch (Exception e) {
+            } catch (Exception ignored) {}
-
-            }
         }
 
         for (Bot bot : room.getBotsOnItem(this)) {
             try {
                 this.onWalkOff(bot.getRoomUnit(), room, empty);
-            } catch (Exception e) {
+            } catch (Exception ignored) {}
-            }
+        }
+
+        for (Pet pet : room.getPetsOnItem(this)) {
+            try {
+                this.onWalkOff(pet.getRoomUnit(), room, empty);
+            } catch (Exception ignored) {}
         }
     }
 
@@ -78,7 +81,9 @@ public class InteractionWater extends InteractionDefault {
             return;
 
         if (!pet.getRoomUnit().hasStatus(RoomUnitStatus.SWIM) && pet.getPetData().canSwim) {
-            pet.getRoomUnit().setStatus(RoomUnitStatus.SWIM, "");
+            pet.getRoomUnit().clearStatus();
+            pet.getRoomUnit().setStatus(RoomUnitStatus.SWIM, pet.getRoomUnit().getCurrentLocation().getStackHeight() + "");
+            pet.packetUpdate = true;
         }
     }
 
@@ -91,7 +96,9 @@ public class InteractionWater extends InteractionDefault {
         if(pet == null)
             return;
 
+        pet.getRoomUnit().clearStatus();
         pet.getRoomUnit().removeStatus(RoomUnitStatus.SWIM);
+        pet.packetUpdate = true;
     }
 
     @Override

src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetTree.java

@@ -0,0 +1,108 @@
+package com.eu.habbo.habbohotel.items.interactions.pets;
+
+import com.eu.habbo.Emulator;
+import com.eu.habbo.habbohotel.bots.Bot;
+import com.eu.habbo.habbohotel.items.Item;
+import com.eu.habbo.habbohotel.items.interactions.InteractionDefault;
+import com.eu.habbo.habbohotel.pets.Pet;
+import com.eu.habbo.habbohotel.pets.PetTasks;
+import com.eu.habbo.habbohotel.rooms.*;
+import com.eu.habbo.habbohotel.users.Habbo;
+import com.eu.habbo.habbohotel.users.HabboItem;
+import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer;
+import com.eu.habbo.threading.runnables.PetClearPosture;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class InteractionPetTree extends InteractionDefault {
+    public InteractionPetTree(ResultSet set, Item baseItem) throws SQLException {
+        super(set, baseItem);
+    }
+
+    public InteractionPetTree(int id, int userId, Item item, String extradata, int limitedStack, int limitedSells) {
+        super(id, userId, item, extradata, limitedStack, limitedSells);
+    }
+
+    @Override
+    public void onMove(Room room, RoomTile oldLocation, RoomTile newLocation) {
+        for (Pet pet : room.getPetsAt(oldLocation)) {
+            pet.getRoomUnit().clearStatus();
+            pet.getRoomUnit().setStatus(RoomUnitStatus.RELAX, pet.getRoomUnit().getCurrentLocation().getStackHeight() + "");
+            pet.packetUpdate = true;
+        }
+    }
+    @Override
+    public void onPickUp(Room room) {
+        for (Pet pet : room.getPetsOnItem(this)) {
+            pet.getRoomUnit().clearStatus();
+            pet.getRoomUnit().setStatus(RoomUnitStatus.RELAX, pet.getRoomUnit().getCurrentLocation().getStackHeight() + "");
+            pet.packetUpdate = true;
+        }
+    }
+
+    @Override
+    public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception {
+        super.onWalkOn(roomUnit, room, objects);
+
+        Pet pet = room.getPet(roomUnit);
+        if (pet != null && pet.getPetData().haveToyItem(this.getBaseItem()) && this.getOccupyingTiles(room.getLayout()).contains(pet.getRoomUnit().getGoal())) {
+            RoomUnitStatus task = RoomUnitStatus.HANG;
+            switch(pet.getTask()){
+                case RING_OF_FIRE: task = RoomUnitStatus.RINGOFFIRE; break;
+                case SWING: task = RoomUnitStatus.SWING; break;
+                case ROLL: task = RoomUnitStatus.ROLL; break;
+            }
+            if (pet.getEnergy() >= 35 && task != RoomUnitStatus.HANG) {
+
+                 pet.getRoomUnit().setCanWalk(false);
+                 pet.getRoomUnit().setRotation(RoomUserRotation.values()[this.getRotation()]);
+                 pet.getRoomUnit().clearStatus();
+                 pet.getRoomUnit().setStatus(task, pet.getRoomUnit().getCurrentLocation().getStackHeight() + "");
+                 pet.packetUpdate = true;
+                RoomUnitStatus finalTask = task;
+                Emulator.getThreading().run(() -> {
+                     pet.addHappyness(25);
+                     pet.getRoomUnit().clearStatus();
+                     new PetClearPosture(pet, finalTask, null, true);
+                     if (this.getRoomId() == room.getId() && this.getOccupyingTiles(room.getLayout()).contains(pet.getRoomUnit().getCurrentLocation())) {
+                         pet.getRoomUnit().setStatus(RoomUnitStatus.HANG, pet.getRoomUnit().getCurrentLocation().getStackHeight() + "");
+                     } else {
+                         pet.getRoomUnit().setStatus(RoomUnitStatus.RELAX, pet.getRoomUnit().getCurrentLocation().getStackHeight() + "");
+                     }
+                     pet.getRoomUnit().setCanWalk(true);
+                     pet.packetUpdate = true;
+                 }, 2500 + (Emulator.getRandom().nextInt(20) * 500));
+             } else {
+                pet.getRoomUnit().setRotation(RoomUserRotation.values()[this.getRotation()]);
+                pet.getRoomUnit().clearStatus();
+                pet.getRoomUnit().setStatus(RoomUnitStatus.HANG, pet.getRoomUnit().getCurrentLocation().getStackHeight() + "");
+                pet.packetUpdate = true;
+            }
+        }
+    }
+
+    @Override
+    public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) throws Exception {
+        super.onWalkOff(roomUnit, room, objects);
+
+        Pet pet = room.getPet(roomUnit);
+
+        if (pet != null) {
+            pet.getRoomUnit().clearStatus();
+            pet.getRoomUnit().setStatus(RoomUnitStatus.RELAX, pet.getRoomUnit().getCurrentLocation().getStackHeight() + "");
+            pet.packetUpdate = true;
+        }
+    }
+
+    @Override
+    public boolean canWalkOn(RoomUnit roomUnit, Room room, Object[] objects) {
+        Pet pet = room.getPet(roomUnit);
+        return roomUnit.getRoomUnitType() == RoomUnitType.PET && pet != null && pet.getPetData().haveToyItem(this.getBaseItem());
+    }
+
+    @Override
+    public boolean allowWiredResetState() {
+        return false;
+    }
+}

src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java

@@ -3,10 +3,7 @@ package com.eu.habbo.habbohotel.pets;
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.items.Item;
-import com.eu.habbo.habbohotel.items.interactions.pets.InteractionNest;
+import com.eu.habbo.habbohotel.items.interactions.pets.*;
-import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetDrink;
-import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetFood;
-import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetToy;
 import com.eu.habbo.habbohotel.pets.actions.*;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomTile;
@@ -66,7 +63,10 @@ public class PetManager {
             this.put(31, new ActionDance());
             this.put(35, new ActionWings());
             this.put(36, new ActionBreatheFire());
+            this.put(37, new ActionHang());
             this.put(38, new ActionTorch());
+            this.put(40, new ActionSwing());
+            this.put(41, new ActionRoll());
             this.put(42, new ActionRingOfFire());
             this.put(43, new ActionEat());
             this.put(44, new ActionWagTail());
@@ -208,7 +208,7 @@ public class PetManager {
                             PetData.generalFoodItems.add(baseItem);
                         else if (baseItem.getInteractionType().getType() == InteractionPetDrink.class)
                             PetData.generalDrinkItems.add(baseItem);
-                        else if (baseItem.getInteractionType().getType() == InteractionPetToy.class)
+                        else if (baseItem.getInteractionType().getType() == InteractionPetToy.class || baseItem.getInteractionType().getType() == InteractionPetTree.class)
                             PetData.generalToyItems.add(baseItem);
                     } else {
                         PetData data = this.getPetData(set.getInt("pet_id"));
@@ -220,7 +220,7 @@ public class PetManager {
                                 data.addFoodItem(baseItem);
                             else if (baseItem.getInteractionType().getType() == InteractionPetDrink.class)
                                 data.addDrinkItem(baseItem);
-                            else if (baseItem.getInteractionType().getType() == InteractionPetToy.class)
+                            else if (baseItem.getInteractionType().getType() == InteractionPetToy.class || baseItem.getInteractionType().getType() == InteractionPetTree.class)
                                 data.addToyItem(baseItem);
                         }
                     }
@@ -526,4 +526,4 @@ public class PetManager {
 
         return false;
     }
-}
+}

src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionHang.java

@@ -0,0 +1,70 @@
+package com.eu.habbo.habbohotel.pets.actions;
+
+import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetTree;
+import com.eu.habbo.habbohotel.pets.Pet;
+import com.eu.habbo.habbohotel.pets.PetAction;
+import com.eu.habbo.habbohotel.pets.PetTasks;
+import com.eu.habbo.habbohotel.pets.PetVocalsType;
+import com.eu.habbo.habbohotel.rooms.RoomTile;
+import com.eu.habbo.habbohotel.rooms.RoomTileState;
+import com.eu.habbo.habbohotel.users.Habbo;
+import com.eu.habbo.habbohotel.users.HabboItem;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Set;
+
+public class ActionHang extends PetAction {
+    public ActionHang() {
+        super(null, true);
+    }
+
+    @Override
+    public boolean apply(Pet pet, Habbo habbo, String[] data) {
+        if (pet.getHappyness() < 50) {
+            pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+            return false;
+        } else {
+
+            Set<HabboItem> petTrees = pet.getRoom().getRoomSpecialTypes().getItemsOfType(InteractionPetTree.class);
+
+            if (petTrees == null || petTrees.isEmpty()) {
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                return false;
+            }
+
+            ArrayList<RoomTile> tileList = new ArrayList<>();
+
+            for (HabboItem petTree : petTrees) {
+                if (petTree == null || petTree.getRoomId() != pet.getRoom().getId()) continue;
+                tileList.addAll(petTree.getOccupyingTiles(pet.getRoom().getLayout()));
+            }
+
+            if (!tileList.isEmpty()) {
+                Collections.shuffle(tileList);
+                RoomTile goal = tileList.get(0);
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_NEUTRAL));
+
+                if (goal == null || goal.state == RoomTileState.BLOCKED) {
+                    goal = pet.getRoomUnit().getClosestTile(tileList);
+                }
+                pet.setTask(PetTasks.HANG);
+                if (goal.distance(pet.getRoomUnit().getCurrentLocation()) == 0) {
+                    HabboItem tree = pet.getRoom().getItemsAt(goal).stream().filter(habboItem -> habboItem instanceof InteractionPetTree).findAny().orElse(null);
+                    if (tree != null) {
+                        try {
+                            tree.onWalkOn(pet.getRoomUnit(), pet.getRoom(), null);
+                        } catch (Exception ignored) {}
+                    } else {
+                        pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                        return false;
+                    }
+                } else pet.getRoomUnit().setGoalLocation(goal);
+                return true;
+            } else {
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                return false;
+            }
+        }
+    }
+}

src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionRingOfFire.java

@@ -1,32 +1,70 @@
 package com.eu.habbo.habbohotel.pets.actions;
 
-import com.eu.habbo.Emulator;
+import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetTree;
 import com.eu.habbo.habbohotel.pets.Pet;
 import com.eu.habbo.habbohotel.pets.PetAction;
+import com.eu.habbo.habbohotel.pets.PetTasks;
 import com.eu.habbo.habbohotel.pets.PetVocalsType;
-import com.eu.habbo.habbohotel.rooms.RoomUnitStatus;
+import com.eu.habbo.habbohotel.rooms.RoomTile;
+import com.eu.habbo.habbohotel.rooms.RoomTileState;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.threading.runnables.PetClearPosture;
+import com.eu.habbo.habbohotel.users.HabboItem;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Set;
 
 public class ActionRingOfFire extends PetAction {
     public ActionRingOfFire() {
         super(null, true);
-
-        this.minimumActionDuration = 2000;
-        this.statusToSet.add(RoomUnitStatus.RINGOFFIRE);
     }
 
-    // TO-DO: Make it specifically for the toy tree. I dont have the skills for that
     @Override
     public boolean apply(Pet pet, Habbo habbo, String[] data) {
         if (pet.getHappyness() < 50) {
             pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
             return false;
         } else {
-            pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_NEUTRAL));
-        }
 
-        Emulator.getThreading().run(new PetClearPosture(pet, RoomUnitStatus.RINGOFFIRE, null, false), this.minimumActionDuration);
+            Set<HabboItem> petTrees = pet.getRoom().getRoomSpecialTypes().getItemsOfType(InteractionPetTree.class);
-        return true;
+
+            if (petTrees == null || petTrees.isEmpty()) {
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                return false;
+            }
+
+            ArrayList<RoomTile> tileList = new ArrayList<>();
+
+            for (HabboItem petTree : petTrees) {
+                if (petTree == null || petTree.getRoomId() != pet.getRoom().getId()) continue;
+                tileList.addAll(petTree.getOccupyingTiles(pet.getRoom().getLayout()));
+            }
+
+            if (!tileList.isEmpty()) {
+                Collections.shuffle(tileList);
+                RoomTile goal = tileList.get(0);
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_NEUTRAL));
+
+                if (goal == null || goal.state == RoomTileState.BLOCKED) {
+                    goal = pet.getRoomUnit().getClosestTile(tileList);
+                }
+                pet.setTask(PetTasks.RING_OF_FIRE);
+                if (goal.distance(pet.getRoomUnit().getCurrentLocation()) == 0) {
+                    HabboItem tree = pet.getRoom().getItemsAt(goal).stream().filter(habboItem -> habboItem instanceof InteractionPetTree).findAny().orElse(null);
+                    if (tree != null) {
+                        try {
+                            tree.onWalkOn(pet.getRoomUnit(), pet.getRoom(), null);
+                        } catch (Exception ignored) {}
+                    } else {
+                        pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                        return false;
+                    }
+                } else pet.getRoomUnit().setGoalLocation(goal);
+                return true;
+            } else {
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                return false;
+            }
+        }
     }
 }

src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionRoll.java

@@ -0,0 +1,70 @@
+package com.eu.habbo.habbohotel.pets.actions;
+
+import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetTree;
+import com.eu.habbo.habbohotel.pets.Pet;
+import com.eu.habbo.habbohotel.pets.PetAction;
+import com.eu.habbo.habbohotel.pets.PetTasks;
+import com.eu.habbo.habbohotel.pets.PetVocalsType;
+import com.eu.habbo.habbohotel.rooms.RoomTile;
+import com.eu.habbo.habbohotel.rooms.RoomTileState;
+import com.eu.habbo.habbohotel.users.Habbo;
+import com.eu.habbo.habbohotel.users.HabboItem;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Set;
+
+public class ActionRoll extends PetAction {
+    public ActionRoll() {
+        super(null, true);
+    }
+
+    @Override
+    public boolean apply(Pet pet, Habbo habbo, String[] data) {
+        if (pet.getHappyness() < 50) {
+            pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+            return false;
+        } else {
+
+            Set<HabboItem> petTrees = pet.getRoom().getRoomSpecialTypes().getItemsOfType(InteractionPetTree.class);
+
+            if (petTrees == null || petTrees.isEmpty()) {
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                return false;
+            }
+
+            ArrayList<RoomTile> tileList = new ArrayList<>();
+
+            for (HabboItem petTree : petTrees) {
+                if (petTree == null || petTree.getRoomId() != pet.getRoom().getId()) continue;
+                tileList.addAll(petTree.getOccupyingTiles(pet.getRoom().getLayout()));
+            }
+
+            if (!tileList.isEmpty()) {
+                Collections.shuffle(tileList);
+                RoomTile goal = tileList.get(0);
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_NEUTRAL));
+
+                if (goal == null || goal.state == RoomTileState.BLOCKED) {
+                    goal = pet.getRoomUnit().getClosestTile(tileList);
+                }
+                pet.setTask(PetTasks.ROLL);
+                if (goal.distance(pet.getRoomUnit().getCurrentLocation()) == 0) {
+                    HabboItem tree = pet.getRoom().getItemsAt(goal).stream().filter(habboItem -> habboItem instanceof InteractionPetTree).findAny().orElse(null);
+                    if (tree != null) {
+                        try {
+                            tree.onWalkOn(pet.getRoomUnit(), pet.getRoom(), null);
+                        } catch (Exception ignored) {}
+                    } else {
+                        pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                        return false;
+                    }
+                } else pet.getRoomUnit().setGoalLocation(goal);
+                return true;
+            } else {
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                return false;
+            }
+        }
+    }
+}

src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionSwing.java

@@ -0,0 +1,70 @@
+package com.eu.habbo.habbohotel.pets.actions;
+
+import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetTree;
+import com.eu.habbo.habbohotel.pets.Pet;
+import com.eu.habbo.habbohotel.pets.PetAction;
+import com.eu.habbo.habbohotel.pets.PetTasks;
+import com.eu.habbo.habbohotel.pets.PetVocalsType;
+import com.eu.habbo.habbohotel.rooms.RoomTile;
+import com.eu.habbo.habbohotel.rooms.RoomTileState;
+import com.eu.habbo.habbohotel.users.Habbo;
+import com.eu.habbo.habbohotel.users.HabboItem;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Set;
+
+public class ActionSwing extends PetAction {
+    public ActionSwing() {
+        super(null, true);
+    }
+
+    @Override
+    public boolean apply(Pet pet, Habbo habbo, String[] data) {
+        if (pet.getHappyness() < 50) {
+            pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+            return false;
+        } else {
+
+            Set<HabboItem> petTrees = pet.getRoom().getRoomSpecialTypes().getItemsOfType(InteractionPetTree.class);
+
+            if (petTrees == null || petTrees.isEmpty()) {
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                return false;
+            }
+
+            ArrayList<RoomTile> tileList = new ArrayList<>();
+
+            for (HabboItem petTree : petTrees) {
+                if (petTree == null || petTree.getRoomId() != pet.getRoom().getId()) continue;
+                tileList.addAll(petTree.getOccupyingTiles(pet.getRoom().getLayout()));
+            }
+
+            if (!tileList.isEmpty()) {
+                Collections.shuffle(tileList);
+                RoomTile goal = tileList.get(0);
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_NEUTRAL));
+
+                if (goal == null || goal.state == RoomTileState.BLOCKED) {
+                    goal = pet.getRoomUnit().getClosestTile(tileList);
+                }
+                pet.setTask(PetTasks.SWING);
+                if (goal.distance(pet.getRoomUnit().getCurrentLocation()) == 0) {
+                    HabboItem tree = pet.getRoom().getItemsAt(goal).stream().filter(habboItem -> habboItem instanceof InteractionPetTree).findAny().orElse(null);
+                    if (tree != null) {
+                        try {
+                            tree.onWalkOn(pet.getRoomUnit(), pet.getRoom(), null);
+                        } catch (Exception ignored) {}
+                    } else {
+                        pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                        return false;
+                    }
+                } else pet.getRoomUnit().setGoalLocation(goal);
+                return true;
+            } else {
+                pet.say(pet.getPetData().randomVocal(PetVocalsType.DISOBEY));
+                return false;
+            }
+        }
+    }
+}

src/main/java/com/eu/habbo/habbohotel/rooms/Room.java

@@ -20,10 +20,7 @@ import com.eu.habbo.habbohotel.items.interactions.games.battlebanzai.Interaction
 import com.eu.habbo.habbohotel.items.interactions.games.freeze.InteractionFreezeExitTile;
 import com.eu.habbo.habbohotel.items.interactions.games.tag.InteractionTagField;
 import com.eu.habbo.habbohotel.items.interactions.games.tag.InteractionTagPole;
-import com.eu.habbo.habbohotel.items.interactions.pets.InteractionNest;
+import com.eu.habbo.habbohotel.items.interactions.pets.*;
-import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetBreedingNest;
-import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetDrink;
-import com.eu.habbo.habbohotel.items.interactions.pets.InteractionPetFood;
 import com.eu.habbo.habbohotel.items.interactions.wired.extra.WiredBlob;
 import com.eu.habbo.habbohotel.messenger.MessengerBuddy;
 import com.eu.habbo.habbohotel.permissions.Permission;
@@ -2393,6 +2390,8 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
                 this.roomSpecialTypes.addPetDrink((InteractionPetDrink) item);
             } else if (item instanceof InteractionPetFood) {
                 this.roomSpecialTypes.addPetFood((InteractionPetFood) item);
+            } else if (item instanceof InteractionPetTree) {
+                this.roomSpecialTypes.addUndefined(item);
             } else if (item instanceof InteractionMoodLight) {
                 this.roomSpecialTypes.addUndefined(item);
             } else if (item instanceof InteractionPyramid) {
@@ -2543,6 +2542,8 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
                     this.roomSpecialTypes.removePetDrink((InteractionPetDrink) item);
                 } else if (item instanceof InteractionPetFood) {
                     this.roomSpecialTypes.removePetFood((InteractionPetFood) item);
+                } else if (item instanceof InteractionPetTree) {
+                    this.roomSpecialTypes.removeUndefined(item);
                 } else if (item instanceof InteractionMoodLight) {
                     this.roomSpecialTypes.removeUndefined(item);
                 } else if (item instanceof InteractionPyramid) {
@@ -2579,6 +2580,8 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
                     this.roomSpecialTypes.removeUndefined(item);
                 } else if (item instanceof InteractionSnowboardSlope) {
                     this.roomSpecialTypes.removeUndefined(item);
+                } else if (item instanceof InteractionBuildArea) {
+                        this.roomSpecialTypes.removeUndefined(item);
                 }
             }
         }
@@ -2923,6 +2926,27 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
         return false;
     }
 
+    public THashSet<Pet> getPetsAt(RoomTile tile) {
+        THashSet<Pet> pets = new THashSet<>();
+        synchronized (this.currentPets) {
+            TIntObjectIterator<Pet> petIterator = this.currentPets.iterator();
+
+            for (int i = this.currentPets.size(); i-- > 0; ) {
+                try {
+                    petIterator.advance();
+
+                    if (petIterator.value().getRoomUnit().getCurrentLocation().equals(tile)) {
+                        pets.add(petIterator.value());
+                    }
+                } catch (Exception e) {
+                    break;
+                }
+            }
+        }
+
+        return pets;
+    }
+
     public THashSet<Bot> getBotsAt(RoomTile tile) {
         THashSet<Bot> bots = new THashSet<>();
         synchronized (this.currentBots) {
@@ -3000,6 +3024,17 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
         return bots;
     }
 
+    public THashSet<Pet> getPetsOnItem(HabboItem item) {
+        THashSet<Pet> pets = new THashSet<>();
+        for (short x = item.getX(); x < item.getX() + item.getBaseItem().getLength(); x++) {
+            for (short y = item.getY(); y < item.getY() + item.getBaseItem().getWidth(); y++) {
+                pets.addAll(this.getPetsAt(this.getLayout().getTile(x, y)));
+            }
+        }
+
+        return pets;
+    }
+
     public void teleportHabboToItem(Habbo habbo, HabboItem item) {
         this.teleportRoomUnitToLocation(habbo.getRoomUnit(), item.getX(), item.getY(), item.getZ() + Item.getCurrentHeight(item));
     }