nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-02-09 08:10:25 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/Ombridride/minetest-minetestforfun-server

Browse Source
This commit is contained in:
Quentin BUISSON-DEBON 2015-05-05 14:16:46 +02:00
commit 7b92dc1dd6
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/mobs/wolf.lua
View File

@ -62,11 +62,11 @@ mobs:register_mob("mobs:wolf", {
minetest.add_entity(self.object:getpos(), "mobs:dog") minetest.add_entity(self.object:getpos(), "mobs:dog")
self.object:remove() self.object:remove()
local dog_obj = minetest.add_entity(self.object:getpos(), "mobs:dog") local dog_obj = minetest.add_entity(self.object:getpos(), "mobs:dog")
dog_obj.tamed == true dog_obj.tamed = true
dog_obj.textures = {{"mobs_dog.png"},}, dog_obj.textures = {"mobs_dog.png"}
dog_obj.damage = 3 dog_obj.damage = 3
dog_obj.walk_velocity = 4, dog_obj.walk_velocity = 4
dog_obj.run_velocity = 4, dog_obj.run_velocity = 4
if dog_obj.owner == "" then if dog_obj.owner == "" then
self.owner = clicker:get_player_name() self.owner = clicker:get_player_name()
else return end else return end

6
mods/throwing/teleport_arrow.lua
View File

@ -51,7 +51,9 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
if obj:get_luaentity() ~= nil then if obj:get_luaentity() ~= nil then
if obj:get_luaentity().name ~= "throwing:arrow_teleport_entity" and obj:get_luaentity().name ~= "__builtin:item" then if obj:get_luaentity().name ~= "throwing:arrow_teleport_entity" and obj:get_luaentity().name ~= "__builtin:item" then
if self.player ~= "" then if self.player ~= "" then
if not minetest.is_protected(pos, self.player:get_player_name()) then
self.player:setpos(pos) self.player:setpos(pos)
end
self.player:get_inventory():add_item("main", ItemStack("throwing:arrow_teleport")) self.player:get_inventory():add_item("main", ItemStack("throwing:arrow_teleport"))
minetest.sound_play("throwing_teleport_arrow", {pos = self.lastpos}) minetest.sound_play("throwing_teleport_arrow", {pos = self.lastpos})
end end
@ -59,7 +61,9 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
end end
else else
if self.player ~= "" then if self.player ~= "" then
if not minetest.is_protected(pos, self.player:get_player_name()) then
self.player:setpos(pos) self.player:setpos(pos)
end
self.player:get_inventory():add_item("main", ItemStack("throwing:arrow_teleport")) self.player:get_inventory():add_item("main", ItemStack("throwing:arrow_teleport"))
minetest.sound_play("throwing_teleport_arrow", {pos = self.lastpos}) minetest.sound_play("throwing_teleport_arrow", {pos = self.lastpos})
end end
@ -71,7 +75,9 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
if self.lastpos.x ~= nil then if self.lastpos.x ~= nil then
if minetest.registered_nodes[node.name].walkable then if minetest.registered_nodes[node.name].walkable then
if self.player ~= "" then if self.player ~= "" then
if not minetest.is_protected(self.lastpos, self.player:get_player_name()) then
self.player:setpos(self.lastpos) self.player:setpos(self.lastpos)
end
self.player:get_inventory():add_item("main", ItemStack("throwing:arrow_teleport")) self.player:get_inventory():add_item("main", ItemStack("throwing:arrow_teleport"))
minetest.sound_play("throwing_teleport_arrow", {pos = self.lastpos}) minetest.sound_play("throwing_teleport_arrow", {pos = self.lastpos})
end end