Merge pull request #79 from duckietm/dev

Dev
This commit is contained in:
DuckieTM
2026-04-14 15:59:49 +02:00
committed by GitHub
3 changed files with 19 additions and 15 deletions
+7 -14
View File
@@ -702,16 +702,12 @@ DROP TEMPORARY TABLE IF EXISTS `tmp_permission_comments`;
DROP PROCEDURE IF EXISTS `refresh_permission_definition_values`;
DELIMITER $$
CREATE PROCEDURE `refresh_permission_definition_values`()
BEGIN
DECLARE done INT DEFAULT 0;
DECLARE current_rank_id INT;
DECLARE current_column_name VARCHAR(32);
DECLARE rank_cursor CURSOR FOR
SELECT `id` FROM `permission_ranks` ORDER BY `id` ASC;
DECLARE rank_cursor CURSOR FOR SELECT `id` FROM `permission_ranks` ORDER BY `id` ASC;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
OPEN rank_cursor;
@@ -729,11 +725,9 @@ BEGIN
CONCAT(
'SELECT ''',
REPLACE(`column_name`, '''', ''''''),
''' AS permission_key, ',
'CAST(COALESCE(FLOOR(`',
''' AS permission_key, CAST(COALESCE(`',
REPLACE(`column_name`, '`', '``'),
'`), 0) AS UNSIGNED) AS permission_value ',
'FROM `permissions` WHERE `id` = ',
'`, ''0'') AS UNSIGNED) AS permission_value FROM `permissions` WHERE `id` = ',
current_rank_id
)
ORDER BY `ordinal_position`
@@ -771,19 +765,18 @@ BEGIN
'` = src.permission_value'
);
PREPARE stmt FROM @permission_rank_update_sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
PREPARE permission_rank_update_stmt FROM @permission_rank_update_sql;
EXECUTE permission_rank_update_stmt;
DEALLOCATE PREPARE permission_rank_update_stmt;
END LOOP;
CLOSE rank_cursor;
END$$
DELIMITER ;
CALL `refresh_permission_definition_values`();
CREATE TABLE IF NOT EXISTS `room_wired_settings` (
`room_id` int(11) NOT NULL,
`inspect_mask` int(11) NOT NULL DEFAULT 0 COMMENT 'Bitmask for who can open and inspect Wired in the room. 1=everyone, 2=users with rights, 4=group members, 8=group admins.',
@@ -0,0 +1,11 @@
UPDATE items_base SET customparams = 'is_invisible' WHERE public_name like 'tile_stackmagic%';
UPDATE items_base SET customparams = 'is_invisible' WHERE public_name like 'tile_walkmagic%';
UPDATE items_base SET customparams = 'is_invisible' WHERE public_name like 'room_invisible_block%';
UPDATE items_base SET customparams = 'is_invisible' WHERE public_name = 'room_invisible_sit_tile';
UPDATE items_base SET customparams = 'is_invisible' WHERE public_name = 'room_invisible_click_tile';
UPDATE `items_base` SET `interaction_type` = 'wf_conf_invis_control' WHERE `public_name` = 'conf_invis_control';
UPDATE `items_base` SET `interaction_type` = 'wf_conf_handitem_block' WHERE `public_name` = 'conf_handitem_block';
UPDATE `items_base` SET `interaction_type` = 'wf_conf_wired_disable' WHERE `public_name` = 'conf_wired_disable';
UPDATE `items_base` SET `interaction_type` = 'wf_conf_queue_speed' WHERE `public_name` = 'conf_queue_speed';
UPDATE `items_base` SET `interaction_type` = 'wf_conf_area_hide' WHERE `public_name` = 'conf_area_hide';
@@ -15,7 +15,7 @@ public class AboutCommand extends Command {
}
public static String credits = "Arcturus Morningstar is an opensource project based on Arcturus By TheGeneral \n" +
"The Following people have all contributed to this emulator:\n" +
"TheGeneral\n Beny\n Alejandro\n Capheus\n Skeletor\n Harmonic\n Mike\n Remco\n zGrav \n Quadral \n Harmony\n Swirny\n ArpyAge\n Mikkel\n Rodolfo\n Rasmus\n Kitt Mustang\n Snaiker\n nttzx\n necmi\n Dome\n Jose Flores\n Cam\n Oliver\n Narzo\n Tenshie\n MartenM\n Ridge\n SenpaiDipper\n Snaiker\n Thijmen\n DuckieTM\n simoleo89\n Medievalshell\n Lorenzune";
"TheGeneral\n Beny\n Alejandro\n Capheus\n Skeletor\n Harmonic\n Mike\n Remco\n zGrav \n Quadral \n Harmony\n Swirny\n ArpyAge\n Mikkel\n Rodolfo\n Rasmus\n Kitt Mustang\n Snaiker\n nttzx\n necmi\n Dome\n Jose Flores\n Cam\n Oliver\n Narzo\n Tenshie\n MartenM\n Ridge\n SenpaiDipper\n Snaiker\n Thijmen\n DuckieTM\n simoleo89\n Medievalshell\n Lorenzo (the wired master)";
@Override
public boolean handle(GameClient gameClient, String[] params) {