aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-30 20:41:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Bug Fixes Round One

Browse Source
This commit is contained in:
Cooldude2606
2018-10-26 16:20:09 +01:00
parent 3e3e9b747c
commit b9435d08ba
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ExpGamingCommands/teleport/control.lua
View File

@@ -3,7 +3,7 @@
-- @author Cooldude2606 -- @author Cooldude2606
-- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE
local Admin = require('ExpGamingAdmin.Teleport@^4.0.0') local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0')
--- Teleports the user to the player given --- Teleports the user to the player given
-- @command go-to -- @command go-to

3
modules/ExpGamingCore/Command/control.lua
View File

@@ -146,7 +146,8 @@ function commands.validate_args(event)
index = index+1 index = index+1
if not word then break end if not word then break end
local pos, _pos = word:find('"') local pos, _pos = word:find('"')
while pos and pos == _pos do local hasSecond = pos and word:find('"',pos+1) or nil
while not hasSecond and pos and pos == _pos do
local next = table.remove(words,index+1) local next = table.remove(words,index+1)
if not next then return commands.error('invalid-parse') end if not next then return commands.error('invalid-parse') end
words[index] = words[index]..' '..next words[index] = words[index]..' '..next

1
modules/ExpGamingCore/Gui/control.lua
View File

@@ -180,6 +180,7 @@ script.on_event('on_tick', function(event)
end) end)
script.on_event('on_player_respawned',function(event) script.on_event('on_player_respawned',function(event)
if Gui.center then Gui.center.clear() end
if loaded_modules['ExpGamingCore.Server'] then return end if loaded_modules['ExpGamingCore.Server'] then return end
if global.players and is_type(global.players,'table') and #global.players > 0 and global.players[event.player_index] then if global.players and is_type(global.players,'table') and #global.players > 0 and global.players[event.player_index] then
local remove = {} local remove = {}

1
modules/ExpGamingCore/Role/control.lua
View File

@@ -327,6 +327,7 @@ function Role._prototype:get_players(online)
if not self_test(self,'role','get_players') then return end if not self_test(self,'role','get_players') then return end
if online and not type_error(online,'boolean','Invalid argument #1 to role:get_players, online is not a boolean.') then return end if online and not type_error(online,'boolean','Invalid argument #1 to role:get_players, online is not a boolean.') then return end
if not global.roles[self.name] then global.roles[self.name] = {} end if not global.roles[self.name] then global.roles[self.name] = {} end
if self.is_default then if online then return game.connected_players else return game.players end end
local rtn = {} local rtn = {}
for _,player_index in pairs(global.roles[self.name]) do for _,player_index in pairs(global.roles[self.name]) do
local player = game.players[player_index] local player = game.players[player_index]

2
modules/WarpPoints/control.lua
View File

@@ -241,7 +241,7 @@ script.on_event(defines.events.on_player_created, function(event)
text='Warp: Spawn', text='Warp: Spawn',
icon={type='item',name=warp_item} icon={type='item',name=warp_item}
}) })
global.warps['Spawn'] = {tag=tag,surface=player.surface.index,position={0,0}} global.warps['Spawn'] = {tag=tag,surface=player.surface.index,position={x=0,y=0}}
end end
end) end)

4
modules/WarpPoints/src/commands.lua
View File

@@ -11,8 +11,8 @@ commands.add_command('make-warp', 'Make a warp point at your location', {
if game.player.gui.top[name] then player_return({'WarpPoints.name-used'},defines.textcolor.med) return commands.error end if game.player.gui.top[name] then player_return({'WarpPoints.name-used'},defines.textcolor.med) return commands.error end
if warps.warps[name] then player_return({'WarpPoints.name-used'},defines.textcolor.med) return commands.error end if warps.warps[name] then player_return({'WarpPoints.name-used'},defines.textcolor.med) return commands.error end
for name,warp in pairs(warps.warps) do for name,warp in pairs(warps.warps) do
local dx = position.x-warp.position[1] local dx = position.x-warp.position.x
local dy = position.y-warp.position[2] local dy = position.y-warp.position.y
if dx^2 + dy^2 < warp_min_distance then player_return({'WarpPoints.too-close'},defines.textcolor.med) return commands.error end if dx^2 + dy^2 < warp_min_distance then player_return({'WarpPoints.too-close'},defines.textcolor.med) return commands.error end
end end
-- to do add a test for all warps -- to do add a test for all warps