Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/eu/habbo/Emulator.java

@@ -40,7 +40,7 @@ public final class Emulator {
     public static final String ANSI_YELLOW = "\u001B[33m";
 
 
-    public final static String PREVIEW = "Stable";
+    public final static String PREVIEW = "RC-3";
 
     public static final String version = "Arcturus Morningstar" + " " + MAJOR + "." + MINOR + "." + BUILD + " " + PREVIEW;
     private static final String logo =

src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java

@@ -42,7 +42,7 @@ public class WiredEffectTeleport extends InteractionWiredEffect {
     }
 
     public static void teleportUnitToTile(RoomUnit roomUnit, RoomTile tile) {
-        if (roomUnit == null || tile == null)
+        if (roomUnit == null || tile == null || roomUnit.isWiredTeleporting)
             return;
 
         Room room = roomUnit.getRoom();
@@ -63,6 +63,7 @@ public class WiredEffectTeleport extends InteractionWiredEffect {
             for (RoomTile optionalTile : optionalTiles) {
                 if (optionalTile.state != RoomTileState.INVALID && optionalTile.state != RoomTileState.BLOCKED) {
                     alternativeTile = optionalTile;
+                    break;
                 }
             }
 
@@ -139,30 +140,13 @@ public class WiredEffectTeleport extends InteractionWiredEffect {
 
     @Override
     public boolean execute(RoomUnit roomUnit, Room room, Object[] stuff) {
-        THashSet<HabboItem> items = new THashSet<>();
+        this.items.removeIf(item -> item == null || item.getRoomId() != this.getRoomId()
-
+                || Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId()).getHabboItem(item.getId()) == null);
-        for (HabboItem item : this.items) {
-            if (item.getRoomId() != this.getRoomId() || Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId()).getHabboItem(item.getId()) == null)
-                items.add(item);
-        }
-
-        for (HabboItem item : items) {
-            this.items.remove(item);
-        }
 
         if (!this.items.isEmpty()) {
-            int i = Emulator.getRandom().nextInt(this.items.size()) + 1;
+            int i = Emulator.getRandom().nextInt(this.items.size());
-            int j = 1;
+            HabboItem item = this.items.get(i);
-
+            teleportUnitToTile(roomUnit, room.getLayout().getTile(item.getX(), item.getY()));
-            int tryCount = 0;
-            while (tryCount < this.items.size()) {
-                tryCount++;
-                HabboItem item = this.items.get((tryCount - 1 + i) % this.items.size());
-
-                teleportUnitToTile(roomUnit, room.getLayout().getTile(item.getX(), item.getY()));
-                break;
-
-            }
             return true;
         }
 
@@ -220,6 +204,6 @@ public class WiredEffectTeleport extends InteractionWiredEffect {
 
     @Override
     protected long requiredCooldown() {
-        return 0;
+        return 50L;
     }
 }

src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java

@@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 
 public class RoomUnit {
+    public boolean isWiredTeleporting = false;
     private final ConcurrentHashMap<RoomUnitStatus, String> status;
     private final THashMap<String, Object> cacheable;
     public boolean canRotate = true;

src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java

@@ -194,19 +194,16 @@ public class WiredHandler {
         if (effect != null && effect.canExecute(millis)) {
             executed = true;
             if (!effect.requiresTriggeringUser() || (roomUnit != null && effect.requiresTriggeringUser())) {
-                Emulator.getThreading().run(new Runnable() {
+                Emulator.getThreading().run(() -> {
-                    @Override
+                    if (room.isLoaded()) {
-                    public void run() {
+                        try {
-                        if (room.isLoaded()) {
+                            if (!effect.execute(roomUnit, room, stuff)) return;
-                            try {
+                            effect.setCooldown(millis);
-                                if (!effect.execute(roomUnit, room, stuff)) return;
+                        } catch (Exception e) {
-                                effect.setCooldown(millis);
+                            Emulator.getLogging().logErrorLine(e);
-                            } catch (Exception e) {
-                                Emulator.getLogging().logErrorLine(e);
-                            }
-
-                            effect.activateBox(room);
                         }
+
+                        effect.activateBox(room);
                     }
                 }, effect.getDelay() * 500);
             }

src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java

@@ -27,6 +27,7 @@ public class RoomUnitTeleport implements Runnable {
         this.y = y;
         this.z = z;
         this.newEffect = newEffect;
+        roomUnit.isWiredTeleporting = true;
     }
 
     @Override
@@ -53,6 +54,7 @@ public class RoomUnitTeleport implements Runnable {
         ServerMessage teleportMessage = new RoomUnitOnRollerComposer(this.roomUnit, t, this.room).compose();
         this.roomUnit.setLocation(t);
         this.room.sendComposer(teleportMessage);
+        roomUnit.isWiredTeleporting = false;
 
         this.room.updateHabbosAt(t.x, t.y);
         this.room.updateBotsAt(t.x, t.y);