nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-23 07:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-roller-trigger-wired' into 'dev'

Browse Source 
fixed wired trigger: User step on furni when on roller

See merge request morningstar/Arcturus-Community!92
This commit is contained in:
Alejandro 2020-01-31 11:52:37 -05:00
commit e244bc20cf
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoller.java
View File

@ -16,6 +16,7 @@ import java.util.List;
public class InteractionRoller extends HabboItem { public class InteractionRoller extends HabboItem {
public static boolean NO_RULES = false; public static boolean NO_RULES = false;
public static int DELAY = 400;
public InteractionRoller(ResultSet set, Item baseItem) throws SQLException { public InteractionRoller(ResultSet set, Item baseItem) throws SQLException {
super(set, baseItem); super(set, baseItem);

2
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

@ -1459,7 +1459,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
} }
} }
} }
}, 500); }, this.getRollerSpeed() == 0 ? 250 : InteractionRoller.DELAY);
} }
} }

3
src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java
View File

@ -1,6 +1,7 @@
package com.eu.habbo.messages.outgoing.rooms.users; package com.eu.habbo.messages.outgoing.rooms.users;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.items.interactions.InteractionRoller;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.rooms.RoomTile;
import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.rooms.RoomUnit;
@ -65,7 +66,7 @@ public class RoomUnitOnRollerComposer extends MessageComposer {
RoomUnitOnRollerComposer.this.roomUnit.setZ(RoomUnitOnRollerComposer.this.newLocation.getStackHeight()); RoomUnitOnRollerComposer.this.roomUnit.setZ(RoomUnitOnRollerComposer.this.newLocation.getStackHeight());
RoomUnitOnRollerComposer.this.roomUnit.sitUpdate = true; RoomUnitOnRollerComposer.this.roomUnit.sitUpdate = true;
} }
}, this.room.getRollerSpeed() == 0 ? 250 : 400); }, this.room.getRollerSpeed() == 0 ? 250 : InteractionRoller.DELAY);
} else { } else {
this.roomUnit.setLocation(this.newLocation); this.roomUnit.setLocation(this.newLocation);
this.roomUnit.setZ(this.newZ); this.roomUnit.setZ(this.newZ);