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

Made Banzai Pucks work on all flooring, not just banzai tiles (LIKE HABBO)

Browse Source
This commit is contained in:
KrewsOrg 2019-07-02 18:33:47 +01:00
parent 1638dcb758
commit f77866146b
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sqlupdates/2_0_0_TO_2_1_0-RC-1.sql
View File

@ -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'); 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` ALTER TABLE `youtube_playlists`
DROP COLUMN `order`,
CHANGE COLUMN `video_id` `playlist_id` varchar(255) NOT NULL COMMENT 'YouTube playlist ID' AFTER `item_id`; CHANGE COLUMN `video_id` `playlist_id` varchar(255) NOT NULL COMMENT 'YouTube playlist ID' AFTER `item_id`;
DROP TABLE `youtube_items`; DROP TABLE `youtube_items`;

9
src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java
View File

@ -127,7 +127,7 @@ public class InteractionBattleBanzaiPuck extends InteractionPushable {
if (room == null || from == null || to == null) return false; if (room == null || from == null || to == null) return false;
HabboItem topItem = room.getTopItemAt(to.x, to.y, this); 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()))); //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); GameTeam team = game.getTeamForHabbo(habbo);
if (team != null) { if (team != null) {
HabboItem item = room.getTopItemAt(to.x, to.y); HabboItem item = room.getTopItemAt(to.x, to.y);
if (item instanceof InteractionBattleBanzaiTile) {
try { try {
item.onWalkOn(kicker, room, null); item.onWalkOn(kicker, room, null);
} catch (Exception e) { } catch (Exception e) {
return; return;
} }
}
this.setExtradata(team.teamColor.type + ""); this.setExtradata(team.teamColor.type + "");
room.updateItemState(this); room.updateItemState(this);
} }
@ -185,7 +181,6 @@ public class InteractionBattleBanzaiPuck extends InteractionPushable {
@Override @Override
public boolean canStillMove(Room room, RoomTile from, RoomTile to, RoomUserRotation direction, RoomUnit kicker, int nextRoll, int currentStep, int totalSteps) { 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();
return to.state == RoomTileState.OPEN && to.isWalkable() && topItem instanceof InteractionBattleBanzaiTile;
} }
} }