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 '600-cme' into 'dev'

Browse Source 
fix(Room): pets CME

See merge request morningstar/Arcturus-Community!142
This commit is contained in:
Harmonic 2020-05-08 05:22:00 -04:00
commit 7f987c7446
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

@ -1992,23 +1992,15 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
* @param excludeUserId Habbo id to keep pets * @param excludeUserId Habbo id to keep pets
*/ */
public void removeAllPets(int excludeUserId) { public void removeAllPets(int excludeUserId) {
ArrayList<Pet> toRemovePets = new ArrayList<>();
ArrayList<Pet> removedPets = new ArrayList<>(); ArrayList<Pet> removedPets = new ArrayList<>();
synchronized (this.currentPets) { synchronized (this.currentPets) {
for (Pet pet : this.currentPets.valueCollection()) { for (Pet pet : this.currentPets.valueCollection()) {
try { try {
if (pet.getUserId() != excludeUserId) { if (pet.getUserId() != excludeUserId) {
toRemovePets.add(pet);
pet.removeFromRoom();
Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(pet.getUserId());
if (habbo != null) {
habbo.getInventory().getPetsComponent().addPet(pet);
habbo.getClient().sendResponse(new AddPetComposer(pet));
}
} }
pet.needsUpdate = true;
pet.run();
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
Emulator.getLogging().logErrorLine(e); Emulator.getLogging().logErrorLine(e);
break; break;
@ -2016,6 +2008,21 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
} }
} }
for (Pet pet : toRemovePets) {
removedPets.add(pet);
pet.removeFromRoom();
Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(pet.getUserId());
if (habbo != null) {
habbo.getInventory().getPetsComponent().addPet(pet);
habbo.getClient().sendResponse(new AddPetComposer(pet));
}
pet.needsUpdate = true;
pet.run();
}
for (Pet pet : removedPets) { for (Pet pet : removedPets) {
this.currentPets.remove(pet.getId()); this.currentPets.remove(pet.getId());
} }