From 42fc25df49431dc3a25fe041a63747cf1695221f Mon Sep 17 00:00:00 2001 From: Gerkiz Date: Sun, 7 Jul 2019 13:00:50 +0200 Subject: [PATCH] Fixed desync Added them at the top which made the game desync, fixed now... --- antigrief.lua | 13 +++++++++++-- chatbot.lua | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/antigrief.lua b/antigrief.lua index 4ceff29a..e0b091b8 100644 --- a/antigrief.lua +++ b/antigrief.lua @@ -5,8 +5,6 @@ local event = require 'utils.event' local session = require 'utils.session_data' -local tracker = session.get_session_table() -local trusted = session.get_trusted_table() local function create_admin_button(player) if player.gui.top["admin_button"] then return end @@ -40,6 +38,8 @@ local function on_player_demoted(event) end local function on_marked_for_deconstruction(event) + local tracker = session.get_session_table() + local trusted = session.get_trusted_table() if not event.player_index then return end local player = game.players[event.player_index] if player.admin == true then return end @@ -56,6 +56,8 @@ local function on_marked_for_deconstruction(event) end local function on_player_ammo_inventory_changed(event) + local tracker = session.get_session_table() + local trusted = session.get_trusted_table() local player = game.players[event.player_index] if player.admin == true then return end if trusted[player.name] == true then return end @@ -70,11 +72,14 @@ local function on_player_ammo_inventory_changed(event) player.surface.spill_item_stack(player.position, {name = "atomic-bomb", count = nukes}, false) player.print("You have not grown accustomed to this technology yet.", {r=0.22, g=0.99, b=0.99}) server_commands.to_discord_bold(table.concat{'[Nuke] ' .. player.name .. ' tried to equip nukes but was not trusted.'}) + player.character.health = 0 end end end local function on_player_built_tile(event) + local tracker = session.get_session_table() + local trusted = session.get_trusted_table() local placed_tiles = event.tiles if placed_tiles[1].old_tile.name ~= "deepwater" and placed_tiles[1].old_tile.name ~= "water" and placed_tiles[1].old_tile.name ~= "water-green" then return end local player = game.players[event.player_index] @@ -107,6 +112,8 @@ local function on_player_built_tile(event) end local function on_built_entity(event) + local tracker = session.get_session_table() + local trusted = session.get_trusted_table() if game.tick < 1296000 then return end if event.created_entity.type == "entity-ghost" then @@ -129,6 +136,8 @@ end --Artillery History and Antigrief local function on_player_used_capsule(event) + local tracker = session.get_session_table() + local trusted = session.get_trusted_table() local player = game.players[event.player_index] local position = event.position local used_item = event.item diff --git a/chatbot.lua b/chatbot.lua index ff361078..0ffac776 100644 --- a/chatbot.lua +++ b/chatbot.lua @@ -1,4 +1,5 @@ local event = require 'utils.event' +local session = require 'utils.session_data' local message_color = {r = 0.5, g = 0.3, b = 1} local brain = { @@ -30,6 +31,7 @@ commands.add_command( 'trust', 'Promotes a player to trusted!', function(cmd) + local trusted = session.get_trusted_table() local server = 'server' local player = game.player local p @@ -48,8 +50,8 @@ commands.add_command( if cmd.parameter == nil then return end local target_player = game.players[cmd.parameter] if target_player then - if global.trusted_players[target_player.name] == true then game.print(target_player.name .. " is already trusted!") return end - global.trusted_players[target_player.name] = true + if trusted[target_player.name] == true then game.print(target_player.name .. " is already trusted!") return end + trusted[target_player.name] = true game.print(target_player.name .. " is now a trusted player.", {r=0.22, g=0.99, b=0.99}) for _, a in pairs(game.connected_players) do if a.admin == true and a.name ~= player.name then @@ -61,8 +63,8 @@ commands.add_command( if cmd.parameter == nil then return end local target_player = game.players[cmd.parameter] if target_player then - if global.trusted_players[target_player.name] == true then game.print(target_player.name .. " is already trusted!") return end - global.trusted_players[target_player.name] = true + if trusted[target_player.name] == true then game.print(target_player.name .. " is already trusted!") return end + trusted[target_player.name] = true game.print(target_player.name .. " is now a trusted player.", {r=0.22, g=0.99, b=0.99}) end end @@ -73,6 +75,7 @@ commands.add_command( 'untrust', 'Demotes a player from trusted!', function(cmd) + local trusted = session.get_trusted_table() local server = 'server' local player = game.player local p @@ -91,8 +94,8 @@ commands.add_command( if cmd.parameter == nil then return end local target_player = game.players[cmd.parameter] if target_player then - if global.trusted_players[target_player.name] == false then game.print(target_player.name .. " is already untrusted!") return end - global.trusted_players[target_player.name] = false + if trusted[target_player.name] == false then game.print(target_player.name .. " is already untrusted!") return end + trusted[target_player.name] = false game.print(target_player.name .. " is now untrusted.", {r=0.22, g=0.99, b=0.99}) for _, a in pairs(game.connected_players) do if a.admin == true and a.name ~= player.name then @@ -104,8 +107,8 @@ commands.add_command( if cmd.parameter == nil then return end local target_player = game.players[cmd.parameter] if target_player then - if global.trusted_players[target_player.name] == false then game.print(target_player.name .. " is already untrusted!") return end - global.trusted_players[target_player.name] = false + if trusted[target_player.name] == false then game.print(target_player.name .. " is already untrusted!") return end + trusted[target_player.name] = false game.print(target_player.name .. " is now untrusted.", {r=0.22, g=0.99, b=0.99}) end end