From 811041a2112fa17b65695e3ff493c8d281899a77 Mon Sep 17 00:00:00 2001 From: Beny Date: Sun, 26 May 2019 17:36:27 +0100 Subject: [PATCH 1/2] Added animation delay to WiredEffectTeleport --- .../items/interactions/wired/effects/WiredEffectTeleport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java index 6e66c93d..dcfa0198 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java @@ -131,7 +131,7 @@ public class WiredEffectTeleport extends InteractionWiredEffect // makes a temporary effect room.sendComposer(new RoomUserEffectComposer(roomUnit, 4).compose()); - Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), WiredHandler.TELEPORT_DELAY); + Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), WiredHandler.TELEPORT_DELAY + 1000); if (tile.state == RoomTileState.INVALID || tile.state == RoomTileState.BLOCKED) { RoomTile alternativeTile = null; From e4b43f3c53e63772e3e318d25eec16be10ecd5f7 Mon Sep 17 00:00:00 2001 From: Beny Date: Sun, 26 May 2019 17:36:54 +0100 Subject: [PATCH 2/2] Fixed all users able to modify guild furni states --- .../interactions/InteractionGuildFurni.java | 41 +------------------ 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGuildFurni.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGuildFurni.java index 624c5b27..c5c51b9f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGuildFurni.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGuildFurni.java @@ -12,7 +12,7 @@ import com.eu.habbo.messages.ServerMessage; import java.sql.ResultSet; import java.sql.SQLException; -public class InteractionGuildFurni extends HabboItem +public class InteractionGuildFurni extends InteractionDefault { private int guildId; @@ -70,45 +70,6 @@ public class InteractionGuildFurni extends HabboItem return this.getBaseItem().allowWalk(); } - @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception - { - super.onClick(client, room, objects); - - if (objects.length > 0) - { - if (objects[0] instanceof Integer && room != null) - { - if(this.getExtradata().length() == 0) - this.setExtradata("0"); - - if(this.getBaseItem().getStateCount() > 1) - { - this.setExtradata("" + (Integer.valueOf(this.getExtradata()) + 1) % this.getBaseItem().getStateCount()); - this.needsUpdate(true); - room.updateItemState(this); - } - } - } - } - - @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception - { - } - - @Override - public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception - { - super.onWalkOn(roomUnit, room, objects); - } - - @Override - public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) throws Exception - { - super.onWalkOff(roomUnit, room, objects); - } - public int getGuildId() { return this.guildId;