diff --git a/sqlupdates/2_0_0_TO_2_1_0-RC-1.sql b/sqlupdates/2_0_0_TO_2_1_0-RC-1.sql index be6dc99c..2b1215f1 100644 --- a/sqlupdates/2_0_0_TO_2_1_0-RC-1.sql +++ b/sqlupdates/2_0_0_TO_2_1_0-RC-1.sql @@ -25,7 +25,6 @@ UPDATE `pet_actions` SET `can_swim` = '1' WHERE `pet_type` = 9 OR `pet_type` = 1 UPDATE `items_base` SET `customparams` = '30,60,120,180,300,600', `interaction_type` = 'game_timer', `interaction_modes_count` = 1 WHERE `item_name` IN ('fball_counter','bb_counter','es_counter'); ALTER TABLE `youtube_playlists` -DROP COLUMN `order`, CHANGE COLUMN `video_id` `playlist_id` varchar(255) NOT NULL COMMENT 'YouTube playlist ID' AFTER `item_id`; DROP TABLE `youtube_items`; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java index d8ec242c..1ff4c3c7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java @@ -127,7 +127,7 @@ public class InteractionBattleBanzaiPuck extends InteractionPushable { if (room == null || from == null || to == null) return false; HabboItem topItem = room.getTopItemAt(to.x, to.y, this); - return topItem != null && topItem instanceof InteractionBattleBanzaiTile; + return topItem != null; //return !(!room.getLayout().tileWalkable(to.x, to.y) || (topItem != null && (!topItem.getBaseItem().setAllowStack() || topItem.getBaseItem().allowSit() || topItem.getBaseItem().allowLay()))); } @@ -156,15 +156,11 @@ public class InteractionBattleBanzaiPuck extends InteractionPushable { GameTeam team = game.getTeamForHabbo(habbo); if (team != null) { HabboItem item = room.getTopItemAt(to.x, to.y); - - if (item instanceof InteractionBattleBanzaiTile) { try { item.onWalkOn(kicker, room, null); } catch (Exception e) { return; } - } - this.setExtradata(team.teamColor.type + ""); room.updateItemState(this); } @@ -185,7 +181,6 @@ public class InteractionBattleBanzaiPuck extends InteractionPushable { @Override public boolean canStillMove(Room room, RoomTile from, RoomTile to, RoomUserRotation direction, RoomUnit kicker, int nextRoll, int currentStep, int totalSteps) { - HabboItem topItem = room.getTopItemAt(to.x, to.y); - return to.state == RoomTileState.OPEN && to.isWalkable() && topItem instanceof InteractionBattleBanzaiTile; + return to.state == RoomTileState.OPEN && to.isWalkable(); } }