mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2025-01-31 12:22:36 +01:00
Merge branch 'fix-match-furni-bug' into 'dev'
Don't activate match furni effect if settings are not configured See merge request morningstar/Arcturus-Community!101
This commit is contained in:
commit
81b75e8172
@ -44,6 +44,9 @@ public class WiredEffectMatchFurni extends InteractionWiredEffect {
|
|||||||
THashSet<RoomTile> tilesToUpdate = new THashSet<>(this.settings.size());
|
THashSet<RoomTile> tilesToUpdate = new THashSet<>(this.settings.size());
|
||||||
//this.refresh();
|
//this.refresh();
|
||||||
|
|
||||||
|
if(this.settings.isEmpty())
|
||||||
|
return false;
|
||||||
|
|
||||||
for (WiredMatchFurniSetting setting : this.settings) {
|
for (WiredMatchFurniSetting setting : this.settings) {
|
||||||
HabboItem item = room.getHabboItem(setting.itemId);
|
HabboItem item = room.getHabboItem(setting.itemId);
|
||||||
if (item != null) {
|
if (item != null) {
|
||||||
@ -126,7 +129,6 @@ public class WiredEffectMatchFurni extends InteractionWiredEffect {
|
|||||||
|
|
||||||
if (slideAnimation && t != null) {
|
if (slideAnimation && t != null) {
|
||||||
room.sendComposer(new FloorItemOnRollerComposer(item, null, t, offsetZ, room).compose());
|
room.sendComposer(new FloorItemOnRollerComposer(item, null, t, offsetZ, room).compose());
|
||||||
room.updateTiles(room.getLayout().getTilesAt(room.getLayout().getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), item.getRotation()));
|
|
||||||
} else {
|
} else {
|
||||||
room.updateItem(item);
|
room.updateItem(item);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user