minetest-mods/nether
1
0
Fork 1
mirror of https://github.com/minetest-mods/nether.git synced 2024-12-28 20:00:30 +01:00
Code Issues Releases Wiki Activity

Handle edge-case when player quits the game while teleporting

Browse Source 
Issue was raised as a pull request against the original code - https://github.com/minetest-mods/nether/pull/12
Also replaces deprecated getpos/setpos with get_pos/set_pos - https://github.com/minetest-mods/nether/pull/11
This commit is contained in:
Treer 2020-01-05 20:14:30 +11:00 committed by SmallJoker
parent 4985e199b1
commit 4ebdf7f25f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
portal_api.lua
View File

@ -1102,7 +1102,10 @@ end
local function ensure_remote_portal_then_teleport(player, portal_definition, local_anchorPos, local_orientation, destination_wormholePos) local function ensure_remote_portal_then_teleport(player, portal_definition, local_anchorPos, local_orientation, destination_wormholePos)
-- check player is still standing in a portal -- check player is still standing in a portal
local playerPos = player:getpos() local playerPos = player:get_pos()
if playerPos == nil then
return -- player quit the game while teleporting
end
playerPos.y = playerPos.y + 0.1 -- Fix some glitches at -8000 playerPos.y = playerPos.y + 0.1 -- Fix some glitches at -8000
if minetest.get_node(playerPos).name ~= portal_definition.wormhole_node_name then if minetest.get_node(playerPos).name ~= portal_definition.wormhole_node_name then
return -- the player has moved out of the portal return -- the player has moved out of the portal
@ -1162,7 +1165,7 @@ local function ensure_remote_portal_then_teleport(player, portal_definition, loc
local offset = vector.subtract(playerPos, local_wormholePos) -- preserve player's position in the portal local offset = vector.subtract(playerPos, local_wormholePos) -- preserve player's position in the portal
local rotated_offset = {x = math.cos(rotation_angle) * offset.x - math.sin(rotation_angle) * offset.z, y = offset.y, z = math.sin(rotation_angle) * offset.x + math.cos(rotation_angle) * offset.z} local rotated_offset = {x = math.cos(rotation_angle) * offset.x - math.sin(rotation_angle) * offset.z, y = offset.y, z = math.sin(rotation_angle) * offset.x + math.cos(rotation_angle) * offset.z}
local new_playerPos = vector.add(destination_wormholePos, rotated_offset) local new_playerPos = vector.add(destination_wormholePos, rotated_offset)
player:setpos(new_playerPos) player:set_pos(new_playerPos)
player:set_look_horizontal(player:get_look_horizontal() + rotation_angle) player:set_look_horizontal(player:get_look_horizontal() + rotation_angle)
if portal_definition.on_player_teleported ~= nil then if portal_definition.on_player_teleported ~= nil then