From 084c6d01566b75c388600d9aa773ff40cd4dc572 Mon Sep 17 00:00:00 2001 From: Erusman Date: Fri, 10 Sep 2021 07:03:17 -0700 Subject: [PATCH] Player character alts can now access harvesters and generators placed on same account --- sku.0/sys.server/compiled/game/script/base_class.java | 4 ++-- .../compiled/game/script/terminal/terminal_structure.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/base_class.java b/sku.0/sys.server/compiled/game/script/base_class.java index 5d9708343..e3e7b0c7d 100755 --- a/sku.0/sys.server/compiled/game/script/base_class.java +++ b/sku.0/sys.server/compiled/game/script/base_class.java @@ -22290,11 +22290,11 @@ public class base_class /** * Check station id to see if two characters belong to the same account * - * @param player1 + * @param player1 * @param player2 * @return true or false */ - private static boolean charactersAreSamePlayer(obj_id player1, obj_id player2) { + public static boolean charactersAreSamePlayer(obj_id player1, obj_id player2) { return getPlayerStationId(player1) == getPlayerStationId(player2); } diff --git a/sku.0/sys.server/compiled/game/script/terminal/terminal_structure.java b/sku.0/sys.server/compiled/game/script/terminal/terminal_structure.java index a49c798b6..d1d5913f2 100755 --- a/sku.0/sys.server/compiled/game/script/terminal/terminal_structure.java +++ b/sku.0/sys.server/compiled/game/script/terminal/terminal_structure.java @@ -91,7 +91,7 @@ public class terminal_structure extends script.base_script int owner_root = mi.addRootMenu(menu_info_types.SERVER_MENU16, SID_SHOW_MAYOR_OWNER); } } - if (player_structure.isAdmin(structure, player)) + if (player_structure.isAdmin(structure, player) || charactersAreSamePlayer(player, getOwner(structure))) { blog("terminal_structure::OnObjectMenuRequest - you are admin"); if (player_structure.isHarvester(structure) || player_structure.isGenerator(structure)) @@ -299,7 +299,7 @@ public class terminal_structure extends script.base_script player_structure.validateHarvestedResources(structure); } } - if (!player_structure.isAdmin(structure, player) && !player_structure.isAbandoned(structure)) + if (!player_structure.isAdmin(structure, player) && !charactersAreSamePlayer(player, getOwner(structure)) && !player_structure.isAbandoned(structure)) { return SCRIPT_CONTINUE; }