mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-20 12:29:23 +01:00
Fix movement delay not applying to relaymove (#21408)
See title. Prevents getting spammed by It won't budge! (and probably lagging the server, too)
This commit is contained in:
@@ -157,10 +157,11 @@
|
||||
* This is called when a client tries to move, usually it dispatches the moving request to the mob it's controlling
|
||||
*/
|
||||
/client/Move(new_loc, direct)
|
||||
if(world.time < move_delay) //do not move anything ahead of this check please
|
||||
if(moving || world.time < move_delay) //do not move anything ahead of this check please
|
||||
return FALSE
|
||||
|
||||
var/old_move_delay = move_delay
|
||||
move_delay = world.time + world.tick_lag
|
||||
|
||||
if(!direct || !new_loc)
|
||||
return FALSE
|
||||
@@ -174,9 +175,6 @@
|
||||
Process_Incorpmove(direct, mob)
|
||||
return
|
||||
|
||||
if(moving || world.time < move_delay)
|
||||
return 0
|
||||
|
||||
if(mob.stat == DEAD && isliving(mob))
|
||||
mob.ghostize()
|
||||
return
|
||||
@@ -233,6 +231,7 @@
|
||||
|
||||
if(isobj(mob.loc) || ismob(mob.loc)) //Inside an object, tell it we are moving out
|
||||
var/atom/O = mob.loc
|
||||
move_delay += (mob.movement_delay() + GLOB.config.walk_speed) * GLOB.config.walk_delay_multiplier
|
||||
return O.relaymove(mob, direct)
|
||||
|
||||
if(isturf(mob.loc))
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
# Your name.
|
||||
author: JohnWildkins
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
|
||||
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- bugfix: "Fix movement delay not applying while inside a locker, bin, or other object."
|
||||
Reference in New Issue
Block a user