nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2025-01-31 12:22:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev

Browse Source
This commit is contained in:
Alejandro 2019-05-26 20:01:01 +03:00
commit 10f1606919
2 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGuildFurni.java
View File

@ -12,7 +12,7 @@ import com.eu.habbo.messages.ServerMessage;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
public class InteractionGuildFurni extends HabboItem public class InteractionGuildFurni extends InteractionDefault
{ {
private int guildId; private int guildId;
@ -70,45 +70,6 @@ public class InteractionGuildFurni extends HabboItem
return this.getBaseItem().allowWalk(); 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() public int getGuildId()
{ {
return this.guildId; return this.guildId;

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

@ -131,7 +131,7 @@ public class WiredEffectTeleport extends InteractionWiredEffect
// makes a temporary effect // makes a temporary effect
room.sendComposer(new RoomUserEffectComposer(roomUnit, 4).compose()); 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) { if (tile.state == RoomTileState.INVALID || tile.state == RoomTileState.BLOCKED) {
RoomTile alternativeTile = null; RoomTile alternativeTile = null;