nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-27 08:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'modification-user-walks-to-pet-when-scratching' into 'ms4/dev'

Browse Source 
Let avatar walk to an adjacent tile before scratching the pet #1886

See merge request morningstar/Arcturus-Community!45
This commit is contained in:
John 2023-01-19 12:47:26 +00:00
commit 3d0330742b
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RespectPetEvent.java
View File

@ -3,7 +3,14 @@ package com.eu.habbo.messages.incoming.rooms.pets;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.pets.MonsterplantPet; import com.eu.habbo.habbohotel.pets.MonsterplantPet;
import com.eu.habbo.habbohotel.pets.Pet; import com.eu.habbo.habbohotel.pets.Pet;
import com.eu.habbo.habbohotel.rooms.RoomTile;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.threading.runnables.RoomUnitWalkToLocation;
import com.eu.habbo.habbohotel.users.Habbo;
import java.util.ArrayList;
import java.util.List;
public class RespectPetEvent extends MessageHandler { public class RespectPetEvent extends MessageHandler {
@ -11,21 +18,29 @@ public class RespectPetEvent extends MessageHandler {
public void handle() { public void handle() {
final int petId = this.packet.readInt(); final int petId = this.packet.readInt();
if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) { final Habbo habbo = this.client.getHabbo();
return; if (habbo == null) { return; }
}
final Pet pet = this.client.getHabbo().getHabboInfo().getCurrentRoom().getPet(petId); final Room room = habbo.getHabboInfo().getCurrentRoom();
if (room == null) { return; }
if (pet == null) { final Pet pet = room.getPet(petId);
return; if (pet == null) { return; }
}
if (this.client.getHabbo().getHabboStats().getPetRespectPointsToGive() > 0 || pet instanceof MonsterplantPet) { if (habbo.getHabboStats().getPetRespectPointsToGive() > 0 || pet instanceof MonsterplantPet) {
pet.scratched(this.client.getHabbo());
// Update the stats to the database. List<Runnable> tasks = new ArrayList<>();
Emulator.getThreading().run(pet); tasks.add(() -> {
pet.scratched(habbo);
Emulator.getThreading().run(pet);
});
RoomTile tile = habbo.getRoomUnit().getClosestAdjacentTile(pet.getRoomUnit().getX(), pet.getRoomUnit().getY(), true);
if(tile != null) {
habbo.getRoomUnit().setGoalLocation(tile);
}
Emulator.getThreading().run(new RoomUnitWalkToLocation(habbo.getRoomUnit(), tile, room, tasks, tasks));
} }
} }
} }