From d5850e7e0bb609ec143f3b469938b00a328b5664 Mon Sep 17 00:00:00 2001 From: duckietm Date: Mon, 13 Apr 2026 16:36:43 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=86=99=20Fixed=20not=20saveing=20selected?= =?UTF-8?q?=20furni?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wired/conditions/WiredConditionFurniHaveFurni.java | 4 ++++ .../wired/conditions/WiredConditionFurniHaveHabbo.java | 4 ++++ .../wired/conditions/WiredConditionFurniTypeMatch.java | 4 ++++ .../wired/conditions/WiredConditionHasAltitude.java | 4 ++++ .../wired/conditions/WiredConditionNotFurniHaveFurni.java | 4 ++++ .../wired/conditions/WiredConditionNotFurniHaveHabbo.java | 4 ++++ .../wired/conditions/WiredConditionTriggerOnFurni.java | 4 ++++ .../interactions/wired/effects/WiredEffectBotTeleport.java | 4 ++++ .../wired/effects/WiredEffectBotWalkToFurni.java | 4 ++++ .../wired/effects/WiredEffectChangeFurniDirection.java | 4 ++++ .../interactions/wired/effects/WiredEffectMoveFurniAway.java | 4 ++++ .../interactions/wired/effects/WiredEffectMoveFurniTo.java | 5 +++++ .../wired/effects/WiredEffectMoveFurniTowards.java | 4 ++++ .../wired/effects/WiredEffectMoveRotateFurni.java | 4 ++++ .../interactions/wired/effects/WiredEffectToggleFurni.java | 4 ++++ .../interactions/wired/effects/WiredEffectToggleRandom.java | 4 ++++ .../interactions/wired/effects/WiredEffectTriggerStacks.java | 4 ++++ .../interactions/wired/effects/WiredEffectUserFurniBase.java | 4 ++++ .../interactions/wired/effects/WiredEffectUserToFurni.java | 4 ++++ .../interactions/wired/selector/WiredEffectFurniOnFurni.java | 4 ++++ .../interactions/wired/selector/WiredEffectUsersOnFurni.java | 4 ++++ .../wired/triggers/WiredTriggerReceiveSignal.java | 2 +- 22 files changed, 86 insertions(+), 1 deletion(-) diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveFurni.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveFurni.java index 1e96dfc3..01eae2ad 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveFurni.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveFurni.java @@ -177,6 +177,10 @@ public class WiredConditionFurniHaveFurni extends InteractionWiredCondition { int count = settings.getFurniIds().length; if (count > Emulator.getConfig().getInt("hotel.wired.furni.selection.count")) return false; + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + this.items.clear(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveHabbo.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveHabbo.java index a12c1874..4fb60898 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveHabbo.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveHabbo.java @@ -164,6 +164,10 @@ public class WiredConditionFurniHaveHabbo extends InteractionWiredCondition { this.all = (params.length > 0) && (params[0] == 1); this.furniSource = (params.length > 1) ? params[1] : ((params.length > 0 && params[0] > 1) ? params[0] : WiredSourceUtil.SOURCE_TRIGGER); + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + this.items.clear(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniTypeMatch.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniTypeMatch.java index 0b91d791..02d2a0c9 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniTypeMatch.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniTypeMatch.java @@ -240,6 +240,10 @@ public class WiredConditionFurniTypeMatch extends InteractionWiredCondition { this.quantifier = (params.length > 2) ? this.normalizeQuantifier(params[2]) : QUANTIFIER_ALL; } + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId()); if (room == null) { return false; diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHasAltitude.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHasAltitude.java index 155da036..43a71b8f 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHasAltitude.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHasAltitude.java @@ -171,6 +171,10 @@ public class WiredConditionHasAltitude extends InteractionWiredCondition { return false; } + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + this.items.clear(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniHaveFurni.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniHaveFurni.java index c4540b26..41f72077 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniHaveFurni.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniHaveFurni.java @@ -177,6 +177,10 @@ public class WiredConditionNotFurniHaveFurni extends InteractionWiredCondition { int count = settings.getFurniIds().length; if (count > Emulator.getConfig().getInt("hotel.wired.furni.selection.count")) return false; + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + this.items.clear(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniHaveHabbo.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniHaveHabbo.java index 3aec0268..a7d85525 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniHaveHabbo.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotFurniHaveHabbo.java @@ -163,6 +163,10 @@ public class WiredConditionNotFurniHaveHabbo extends InteractionWiredCondition { this.all = (params.length > 0) && (params[0] == 1); this.furniSource = (params.length > 1) ? params[1] : ((params.length > 0 && params[0] > 1) ? params[0] : WiredSourceUtil.SOURCE_TRIGGER); + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + this.items.clear(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTriggerOnFurni.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTriggerOnFurni.java index bcc3fa5c..82054911 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTriggerOnFurni.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTriggerOnFurni.java @@ -186,6 +186,10 @@ public class WiredConditionTriggerOnFurni extends InteractionWiredCondition { this.userSource = (params.length > 1) ? params[1] : WiredSourceUtil.SOURCE_TRIGGER; this.quantifier = (params.length > 2) ? this.normalizeQuantifier(params[2]) : QUANTIFIER_ALL; + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + this.items.clear(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java index 582a8f19..cb7d6d22 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java @@ -133,6 +133,10 @@ public class WiredEffectBotTeleport extends InteractionWiredEffect { throw new WiredSaveException("Too many furni selected"); } + if (itemsCount > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + List newItems = new ArrayList<>(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotWalkToFurni.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotWalkToFurni.java index bb345e12..0ccb96b6 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotWalkToFurni.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotWalkToFurni.java @@ -85,6 +85,10 @@ public class WiredEffectBotWalkToFurni extends InteractionWiredEffect { throw new WiredSaveException("Too many furni selected"); } + if (itemsCount > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + List newItems = new ArrayList<>(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectChangeFurniDirection.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectChangeFurniDirection.java index 611b06d1..58756370 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectChangeFurniDirection.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectChangeFurniDirection.java @@ -290,6 +290,10 @@ public class WiredEffectChangeFurniDirection extends InteractionWiredEffect { throw new WiredSaveException("Too many furni selected"); } + if (itemsCount > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + THashMap newItems = new THashMap<>(); for (int i = 0; i < itemsCount; i++) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniAway.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniAway.java index 63d01717..ce14ea24 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniAway.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniAway.java @@ -263,6 +263,10 @@ public class WiredEffectMoveFurniAway extends InteractionWiredEffect { throw new WiredSaveException("Too many furni selected"); } + if (itemsCount > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + List newItems = new ArrayList<>(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java index ecdc90a7..291fc053 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java @@ -59,6 +59,11 @@ public class WiredEffectMoveFurniTo extends InteractionWiredEffect { this.furniSource = settings.getIntParams()[2]; int count = settings.getFurniIds().length; + + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { for (int i = 0; i < count; i++) { this.items.add(room.getHabboItem(settings.getFurniIds()[i])); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTowards.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTowards.java index be02d463..cde1e962 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTowards.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTowards.java @@ -415,6 +415,10 @@ public class WiredEffectMoveFurniTowards extends InteractionWiredEffect { throw new WiredSaveException("Too many furni selected"); } + if (itemsCount > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + List newItems = new ArrayList<>(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveRotateFurni.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveRotateFurni.java index 26bbe3ab..52bbe142 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveRotateFurni.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveRotateFurni.java @@ -261,6 +261,10 @@ public class WiredEffectMoveRotateFurni extends InteractionWiredEffect implement int count = settings.getFurniIds().length; if (count > Emulator.getConfig().getInt("hotel.wired.furni.selection.count", 5)) return false; + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + this.items.clear(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { for (int i = 0; i < count; i++) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleFurni.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleFurni.java index 5c4e4489..6aa3a078 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleFurni.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleFurni.java @@ -169,6 +169,10 @@ public class WiredEffectToggleFurni extends InteractionWiredEffect { throw new WiredSaveException("Too many furni selected"); } + if (itemsCount > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + List newItems = new ArrayList<>(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { for (int i = 0; i < itemsCount; i++) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleRandom.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleRandom.java index 8ba458c2..32ba5870 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleRandom.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleRandom.java @@ -153,6 +153,10 @@ public class WiredEffectToggleRandom extends InteractionWiredEffect { throw new WiredSaveException("Too many furni selected"); } + if (itemsCount > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + List newItems = new ArrayList<>(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java index 7c07f009..b9d79be5 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java @@ -101,6 +101,10 @@ public class WiredEffectTriggerStacks extends InteractionWiredEffect { throw new WiredSaveException("Too many furni selected"); } + if (itemsCount > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + List newItems = new ArrayList<>(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectUserFurniBase.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectUserFurniBase.java index 9f8df66b..359e463b 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectUserFurniBase.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectUserFurniBase.java @@ -275,6 +275,10 @@ public abstract class WiredEffectUserFurniBase extends InteractionWiredEffect { throw new WiredSaveException("Too many furni selected"); } + if (settings.getFurniIds().length > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId()); if (room == null) { throw new WiredSaveException("Room not found"); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectUserToFurni.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectUserToFurni.java index 2d2491d5..09f25bdf 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectUserToFurni.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectUserToFurni.java @@ -197,6 +197,10 @@ public class WiredEffectUserToFurni extends WiredEffectUserFurniBase { throw new WiredSaveException("Too many furni selected"); } + if (settings.getFurniIds().length > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId()); if (room == null) { throw new WiredSaveException("Room not found"); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/selector/WiredEffectFurniOnFurni.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/selector/WiredEffectFurniOnFurni.java index 0e3c9e01..2b70e9b9 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/selector/WiredEffectFurniOnFurni.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/selector/WiredEffectFurniOnFurni.java @@ -92,6 +92,10 @@ public class WiredEffectFurniOnFurni extends InteractionWiredEffect { return false; } + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + this.items.clear(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/selector/WiredEffectUsersOnFurni.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/selector/WiredEffectUsersOnFurni.java index 833d10a4..149ae0cb 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/selector/WiredEffectUsersOnFurni.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/selector/WiredEffectUsersOnFurni.java @@ -79,6 +79,10 @@ public class WiredEffectUsersOnFurni extends InteractionWiredEffect { return false; } + if (count > 0 && this.furniSource == WiredSourceUtil.SOURCE_TRIGGER) { + this.furniSource = WiredSourceUtil.SOURCE_SELECTED; + } + this.items.clear(); if (this.furniSource == WiredSourceUtil.SOURCE_SELECTED) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerReceiveSignal.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerReceiveSignal.java index 77bf5f29..4cd7b0aa 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerReceiveSignal.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerReceiveSignal.java @@ -31,7 +31,7 @@ public class WiredTriggerReceiveSignal extends InteractionWiredTrigger { private static final long ACTIVATION_PULSE_MS = 300L; private static final String ANTENNA_INTERACTION = "antenna"; - private static final String REQUIRE_ANTENNA_ERROR = "Puoi selezionare solo furni antenna."; + private static final String REQUIRE_ANTENNA_ERROR = "You can only select antenna furni."; private int channel = 0; // signal channel (0-based) private THashSet items;