isaacdennis
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Fix mobs colliding with each other/players instead of magnetically' (#1495) from jordan4ibanez/MineClone2-MobTweaks:master into mineclone5 

Reviewed-on: MineClone2/MineClone2#1495
This commit is contained in:
jordan4ibanez 2021-04-08 03:18:24 +00:00
parent 227180035f 6ec66ef6f6
commit b0c60c69d0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mods/ENTITIES/mcl_mobs/api.lua
View File

@ -866,10 +866,12 @@ local check_for_death = function(self, cause, cmi_cause)
remove_texture_mod(self, "^[colorize:#FF000040") remove_texture_mod(self, "^[colorize:#FF000040")
remove_texture_mod(self, "^[brighten") remove_texture_mod(self, "^[brighten")
self.passive = true self.passive = true
self.object:set_properties({ self.object:set_properties({
pointable = false, pointable = false,
collide_with_objects = false, collide_with_objects = false,
}) })
set_velocity(self, 0) set_velocity(self, 0)
local acc = self.object:get_acceleration() local acc = self.object:get_acceleration()
acc.x, acc.y, acc.z = 0, DEFAULT_FALL_SPEED, 0 acc.x, acc.y, acc.z = 0, DEFAULT_FALL_SPEED, 0
@ -3418,7 +3420,6 @@ local mob_activate = function(self, staticdata, def, dtime)
self.timer = 0 self.timer = 0
self.blinktimer = 0 self.blinktimer = 0
self.blinkstatus = false self.blinkstatus = false
self.collide_with_objects = false
-- check existing nametag -- check existing nametag
if not self.nametag then if not self.nametag then
@ -3907,6 +3908,12 @@ minetest.register_entity(name, {
on_detach_child = mob_detach_child, on_detach_child = mob_detach_child,
on_activate = function(self, staticdata, dtime) on_activate = function(self, staticdata, dtime)
--this is a temporary hack so mobs stop
--glitching and acting really weird with the
--default built in engine collision detection
self.object:set_properties({
collide_with_objects = false,
})
return mob_activate(self, staticdata, def, dtime) return mob_activate(self, staticdata, def, dtime)
end, end,
@ -4348,11 +4355,11 @@ end
--todo mob limiting --todo mob limiting
--MAIN LOOP --MAIN LOOP
local timer = 0 local timer = 15 --0
minetest.register_globalstep(function(dtime) minetest.register_globalstep(function(dtime)
timer = timer + dtime timer = timer + dtime
if timer >= 15 then if timer >= 15 then
timer = 0 timer = 0--15--0
for _,player in ipairs(minetest.get_connected_players()) do for _,player in ipairs(minetest.get_connected_players()) do
for i = 1,math.random(5) do for i = 1,math.random(5) do
local player_pos = player:get_pos() local player_pos = player:get_pos()
@ -4361,6 +4368,7 @@ minetest.register_globalstep(function(dtime)
local goal_pos = position_calculation(player_pos) local goal_pos = position_calculation(player_pos)
print(dump(minetest.get_biome_data(goal_pos)))
local mob_def = spawn_dictionary[dimension][math.random(1,#spawn_dictionary[dimension])] local mob_def = spawn_dictionary[dimension][math.random(1,#spawn_dictionary[dimension])]