Merge branch 'hotfix/5.4.3'

config/roles.lua

@@ -217,7 +217,7 @@ Roles.override_player_roles{
     Drahc_pro={'Administrator','Moderator','Member'},
     aldldl={'Sponsor','Administrator','Moderator','Member'},
     LoicB={'Sponsor','Trainee','Member'},
-    Ookl={'Sponsor','Moderator','Member'},
+    ookl={'Sponsor','Moderator','Member'},
     cydes={'Pay to Win','Moderator','Member'},
     darklich14={'Pay to Win','Moderator','Member'},
     porelos={'Pay to Win','Moderator','Member'},

modules/addons/damage-popups.lua

@@ -21,9 +21,9 @@ Event.add(defines.events.on_entity_damaged, function(event)
 
     -- Sets the message
     local message
-    if entity.name == 'player' and config.show_player_health then
+    if entity.name == 'character' and config.show_player_health then
         message = {'damage-popup.player-health',health}
-    elseif entity.name ~= 'player' and cause and cause.name == 'player' and config.show_player_damage then
+    elseif entity.name ~= 'character' and cause and cause.name == 'character' and config.show_player_damage then
         message = {'damage-popup.player-damage',damage}
     end
 

modules/addons/spawn-area.lua

@@ -89,7 +89,7 @@ local function spawn_base(surface,position)
                 table.insert(tiles_to_make,{name=dtile,position=p})
                 local entities_to_remove = surface.find_entities_filtered{area={{p.x-1,p.y-1},{p.x,p.y}}}
                 for _,entity in pairs(entities_to_remove) do
-                    if entity.name ~= 'player' then entity.destroy() end
+                    if entity.name ~= 'character' then entity.destroy() end
                 end
             elseif prod < pr2 then
                 -- if it is inside the pattern radius

modules/commands/roles.lua

@@ -24,7 +24,7 @@ Commands.new_command('unassign-role','Unassigns a role from a player')
 :add_param('player',false,'player-role')
 :add_param('role',false,'role')
 :set_flag('admin-only',true)
-:add_alias('rdemote','unassign','remove-role')
+:add_alias('rdemote','unassign','rerole','remove-role')
 :register(function(player,action_player,role,raw)
     local player_highest = Roles.get_player_highest_role(player)
     if player_highest.index < role.index then

modules/commands/spawn.lua

@@ -4,7 +4,7 @@ local Roles = require 'expcore.roles'
 local function teleport(player)
     local surface = player.surface
     local spawn = player.force.get_spawn_position(surface)
-    local position = surface.find_non_colliding_position('player',spawn,32,1)
+    local position = surface.find_non_colliding_position('character',spawn,32,1)
     if not position then return false end
     if player.driving then player.driving = false end -- kicks a player out a vehicle if in one
     player.teleport(position,surface)

modules/commands/teleport.lua

@@ -3,7 +3,7 @@ require 'config.command_parse_general'
 
 local function teleport(from_player,to_player)
     local surface = to_player.surface
-    local position = surface.find_non_colliding_position('player',to_player.position,32,1)
+    local position = surface.find_non_colliding_position('character',to_player.position,32,1)
     if not position then return false end -- return false if no new position
     if from_player.driving then from_player.driving = false end -- kicks a player out a vehicle if in one
     from_player.teleport(position,surface)