Coder12a
/
pvp_revamped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add: safe fail

master
Coder12a 2021-02-13 18:41:45 -06:00
parent f2989f9875
commit 5f5f33c59d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
punch.lua
View File

@ -152,13 +152,14 @@ local function punch(player, hitter, time_from_last_punch, tool_capabilities, di
end
end
-- Get the second position from the direction of the hitter.
local hit_pos1 = add(hitter_pos, _dir)
local hit_pos2 = add(hit_pos1, multiply(_dir, range))
local ray = raycast(hit_pos1, hit_pos2)
local intersection_point
if not projectile then
-- Get the second position from the direction of the hitter.
local hit_pos1 = add(hitter_pos, _dir)
local hit_pos2 = add(hit_pos1, multiply(_dir, range))
local ray = raycast(hit_pos1, hit_pos2)
for pointed_thing in ray do
if pointed_thing.type == "object" and pointed_thing.ref:is_player() and pointed_thing.ref:get_player_name() == name then
intersection_point = pointed_thing.intersection_point
@ -171,6 +172,10 @@ local function punch(player, hitter, time_from_last_punch, tool_capabilities, di
intersection_point = projectile_intersection_point
end
if intersection_point == nil then
return
end
local newpos = subtract(intersection_point, pos2)
local y1 = intersection_point.y
local y2 = pos2.y