mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2024-11-22 23:10:52 +01:00
Merge branch 'dev' into 'master'
Revert changes to teams See merge request morningstar/Arcturus-Community!580
This commit is contained in:
commit
cd457d61f8
@ -4124,25 +4124,17 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
|
||||
}
|
||||
|
||||
public void giveEffect(RoomUnit roomUnit, int effectId, int duration) {
|
||||
if(roomUnit == null) return;
|
||||
|
||||
Habbo habbo = roomUnit.getRoom().getHabbo(roomUnit);
|
||||
|
||||
if(habbo == null) return;
|
||||
|
||||
if (!habbo.getHabboInfo().isInGame()) {
|
||||
if (duration == -1 || duration == Integer.MAX_VALUE) {
|
||||
duration = Integer.MAX_VALUE;
|
||||
} else {
|
||||
duration += Emulator.getIntUnixTimestamp();
|
||||
}
|
||||
|
||||
if (this.allowEffects) {
|
||||
if (this.allowEffects && roomUnit != null) {
|
||||
roomUnit.setEffectId(effectId, duration);
|
||||
this.sendComposer(new RoomUserEffectComposer(roomUnit).compose());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void giveHandItem(Habbo habbo, int handItem) {
|
||||
this.giveHandItem(habbo.getRoomUnit(), handItem);
|
||||
|
Loading…
Reference in New Issue
Block a user