From 49ed004ce297fa1fc2edd1c4318c1dd1f3c07eeb Mon Sep 17 00:00:00 2001 From: Alejandro <25-alejandro@users.noreply.git.krews.org> Date: Thu, 16 May 2019 13:31:12 +0300 Subject: [PATCH 1/3] Fixes #41 --- .../interactions/wired/effects/WiredEffectTriggerStacks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java index 9e51f95c..675495c5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTriggerStacks.java @@ -119,7 +119,7 @@ public class WiredEffectTriggerStacks extends InteractionWiredEffect @Override public boolean execute(RoomUnit roomUnit, Room room, Object[] stuff) { - if (stuff.length >= 1 && stuff[stuff.length - 1] instanceof WiredEffectTriggerStacks) + if (stuff != null && stuff.length >= 1 && stuff[stuff.length - 1] instanceof WiredEffectTriggerStacks) { return false; } From 829f71bc0f52eb0b2c45a64169ed4ebc264797dc Mon Sep 17 00:00:00 2001 From: Beny Date: Thu, 16 May 2019 12:41:14 +0100 Subject: [PATCH 2/3] Fix wrong height when rolling onto seat --- src/main/java/com/eu/habbo/habbohotel/rooms/Room.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java index aadeb5e2..6e0243ed 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -1691,6 +1691,8 @@ public class Room implements Comparable, ISerialize, Runnable } } + HabboItem nextTileChair = this.getLowestChair(tileInFront); + for(RoomUnit unit : unitsOnTile) { if (rolledUnitIds.contains(unit.getId())) continue; @@ -1722,14 +1724,14 @@ public class Room implements Comparable, ISerialize, Runnable tile.setStackHeight(ridingUnit.getZ() + zOffset); rolledUnitIds.add(ridingUnit.getId()); updatedUnit.remove(ridingUnit); - messages.add(new RoomUnitOnRollerComposer(ridingUnit, roller, ridingUnit.getCurrentLocation(), ridingUnit.getZ(), tile, tile.getStackHeight(), room)); + messages.add(new RoomUnitOnRollerComposer(ridingUnit, roller, ridingUnit.getCurrentLocation(), ridingUnit.getZ(), tile, tile.getStackHeight() + (nextTileChair != null ? -1 : 0), room)); isRiding = true; } } rolledUnitIds.add(unit.getId()); updatedUnit.remove(unit); - messages.add(new RoomUnitOnRollerComposer(unit, roller, unit.getCurrentLocation(), unit.getZ() + (isRiding ? 1 : 0), tile, tile.getStackHeight() + (isRiding ? 1 : 0), room)); + messages.add(new RoomUnitOnRollerComposer(unit, roller, unit.getCurrentLocation(), unit.getZ() + (isRiding ? 1 : 0), tile, tile.getStackHeight() + (isRiding ? 1 : 0) + (nextTileChair != null ? -1 : 0), room)); if (itemsOnRoller.isEmpty()) { From 9b15464fd1219aab3be4d66dd4cea24e4aaf1f9c Mon Sep 17 00:00:00 2001 From: Beny Date: Thu, 16 May 2019 13:26:05 +0100 Subject: [PATCH 3/3] Removed whitespace --- sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql b/sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql index 7435cb55..f6e347dd 100644 --- a/sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql +++ b/sqlupdates/2_0_0-RC-2_TO_2_0_0-RC-3.sql @@ -1,11 +1,11 @@ #DATABASE UPDATE: 2.0.0 RC-2 -> 2.0.0 RC-3 - INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('commands.plugins.oldstyle', '0'); +INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('commands.plugins.oldstyle', '0'); - ALTER TABLE `emulator_errors` - ADD COLUMN `version` varchar(64) NOT NULL AFTER `timestamp`, - ADD COLUMN `build_hash` varchar(64) NOT NULL AFTER `version`; +ALTER TABLE `emulator_errors` +ADD COLUMN `version` varchar(64) NOT NULL AFTER `timestamp`, +ADD COLUMN `build_hash` varchar(64) NOT NULL AFTER `version`; - INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('scripter.modtool.tickets', '1'); +INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('scripter.modtool.tickets', '1'); - #END DATABASE UPDATE: 2.0.0 RC-2 -> 2.0.0 RC-3 \ No newline at end of file +#END DATABASE UPDATE: 2.0.0 RC-2 -> 2.0.0 RC-3 \ No newline at end of file