mods/ac/init.lua

@@ -604,6 +604,32 @@ function ac.on_shutdown()
 	end
 end
 
+function ac.show_path(user, target)
+	local path = ap.get_position_list(target)
+	if not path or #path == 0 then
+		return
+	end
+	local lpath = #path
+
+	for k = 1, lpath, 1 do
+		local data = path[k]
+		local pos = data.pos
+
+		utility.original_add_particle({
+			playername = user,
+			pos = pos,
+			velocity = {x=0, y=0, z=0},
+			acceleration = {x=0, y=0, z=0},
+			expirationtime = 60,
+			size = 4,
+			collisiondetection = false,
+			vertical = false,
+			texture = "heart.png",
+			glow = 14,
+		})
+	end
+end
+
 if not ac.registered then
 	minetest.register_on_joinplayer(function(...)
 		ac.on_joinplayer(...)
@@ -613,6 +639,16 @@ if not ac.registered then
 		ac.on_shutdown(...)
 	end)
 
+	minetest.register_chatcommand("show-path", {
+		params = "<player>",
+		description = "Show user path.",
+		privs = {server=true},
+
+		func = function(pname, param)
+			ac.show_path(pname, param)
+		end,
+	})
+
 	local c = "ac:core"
 	local f = ac.modpath .. "/init.lua"
 	reload.register_file(c, f, false)

mods/ap/init.lua

@@ -27,7 +27,7 @@ function ap.update_players()
 		local add = true
 		if #t > 0 then
 			local op = t[#t].pos
-			if vector_distance(op, p) < 2 then
+			if vector_distance(op, p) < 0.5 then
 				add = false
 			end
 		end

mods/bandages/init.lua

@@ -51,11 +51,6 @@ bandages.delay_from_level = function(level)
   return 0
 end
 
-bandages.target_not_player = function(pname)
-  minetest.chat_send_player(pname, "# Server: Target is not a player.")
-	--easyvend.sound_error(pname)
-end
-
 bandages.target_not_hurt = function(pname, tname)
   minetest.chat_send_player(pname, "# Server: Player <" .. rename.gpn(tname) .. "> is not wounded.")
 	--easyvend.sound_error(pname)
@@ -163,92 +158,105 @@ end
 
 
 
+function bandages.heal_target(itemstack, user, target, level)
+  local pname = user:get_player_name()
+	local tname = target:get_player_name()
+	local hp = target:get_hp()
+	local hp_max = target:get_properties().hp_max
+
+	if hp >= hp_max then
+		return bandages.target_not_hurt(pname, tname)
+	end
+	if hp <= 0 then
+		return bandages.target_is_dead(pname, tname)
+	end
+	if hp < bandages.get_max_damage_for_level(level, hp, hp_max) then
+		return bandages.target_too_hurt(pname, tname, level)
+	end
+	if bandages.players[pname] or bandages.players[tname] then
+		return bandages.medkit_already_in_use(pname)
+	end
+
+	bandages.play_sound_effects(target:get_pos(), level)
+
+	bandages.players[tname] = {pos=target:get_pos()}
+	bandages.players[pname] = {pos=user:get_pos()}
+	minetest.after(bandages.delay_from_level(level), function()
+		local pos = bandages.players[tname].pos
+		bandages.players[tname] = nil
+		bandages.players[pname] = nil
+		local target = minetest.get_player_by_name(tname)
+		if not target or not target:is_player() then return end
+		if vector_distance(target:get_pos(), pos) > bandages.movement_limit_from_level(level) then
+			return bandages.target_moved_too_much(pname, tname)
+		end
+		-- Don't heal target if already dead.
+		-- This solves an exploit people have found.
+		if target:get_hp() == 0 then return end
+		target:set_hp(hp + bandages.hp_from_level(level))
+		bandages.player_bandages_target(pname, tname, target:get_hp(), hp_max)
+	end)
+
+	itemstack:take_item()
+	return itemstack
+end
+
+
+
+function bandages.heal_self(itemstack, user, level)
+  local pname = user:get_player_name()
+	local hp = user:get_hp()
+	local hp_max = user:get_properties().hp_max
+
+	if hp >= hp_max then
+		return bandages.player_not_hurt(pname)
+	end
+	if hp <= 0 then
+		return bandages.player_is_dead(pname)
+	end
+	if hp < bandages.get_max_damage_for_level(level, hp, hp_max) then
+		return bandages.player_too_hurt(pname, level)
+	end
+	if bandages.players[pname] then
+		return bandages.medkit_already_in_use(pname)
+	end
+
+	bandages.play_sound_effects(user:get_pos(), level)
+
+	bandages.players[pname] = {pos=user:get_pos()}
+	minetest.after(bandages.delay_from_level(level), function()
+		local pos = bandages.players[pname].pos
+		bandages.players[pname] = nil
+		local user = minetest.get_player_by_name(pname)
+		if not user or not user:is_player() then return end
+		if vector_distance(user:get_pos(), pos) > bandages.movement_limit_from_level(level) then
+			return bandages.player_moved_too_much(pname)
+		end
+		-- Don't heal user if already dead.
+		-- This solves an exploit people have found.
+		if user:get_hp() == 0 then return end
+		user:set_hp(hp + bandages.hp_from_level(level))
+		bandages.player_bandages_self(pname, user:get_hp(), hp_max)
+	end)
+
+	itemstack:take_item()
+	return itemstack
+end
+
+
+
 bandages.use_bandage = function(itemstack, user, pointed_thing, level)
   if not user or not user:is_player() then return end
-  local pname = user:get_player_name()
   
   if pointed_thing.type == "object" then
     local target = pointed_thing.ref
     if not target or not target:is_player() then
-      return bandages.target_not_player(pname)
-    end
-    local tname = target:get_player_name()
-    local hp = target:get_hp()
-		local hp_max = target:get_properties().hp_max
-    
-    if hp >= hp_max then
-      return bandages.target_not_hurt(pname, tname)
+			return bandages.heal_self(itemstack, user, level)
     end
-    if hp <= 0 then
-      return bandages.target_is_dead(pname, tname)
-    end
-    if hp < bandages.get_max_damage_for_level(level, hp, hp_max) then
-      return bandages.target_too_hurt(pname, tname, level)
-    end
-    if bandages.players[pname] or bandages.players[tname] then
-      return bandages.medkit_already_in_use(pname)
-    end
-    
-    bandages.play_sound_effects(target:get_pos(), level)
-
-    bandages.players[tname] = {pos=target:get_pos()}
-    bandages.players[pname] = {pos=user:get_pos()}
-    minetest.after(bandages.delay_from_level(level), function()
-      local pos = bandages.players[tname].pos
-      bandages.players[tname] = nil
-      bandages.players[pname] = nil
-      local target = minetest.get_player_by_name(tname)
-      if not target or not target:is_player() then return end
-      if vector_distance(target:get_pos(), pos) > bandages.movement_limit_from_level(level) then
-        return bandages.target_moved_too_much(pname, tname)
-      end
-			-- Don't heal target if already dead.
-			-- This solves an exploit people have found.
-			if target:get_hp() == 0 then return end
-      target:set_hp(hp + bandages.hp_from_level(level))
-      bandages.player_bandages_target(pname, tname, target:get_hp(), hp_max)
-    end)
-    
-    itemstack:take_item()
-    return itemstack
-  else
-    -- Otherwise, try to heal self.
-    local hp = user:get_hp()
-		local hp_max = user:get_properties().hp_max
 
-    if hp >= hp_max then
-      return bandages.player_not_hurt(pname)
-    end
-    if hp <= 0 then
-      return bandages.player_is_dead(pname)
-    end
-    if hp < bandages.get_max_damage_for_level(level, hp, hp_max) then
-      return bandages.player_too_hurt(pname, level)
-    end
-    if bandages.players[pname] then
-      return bandages.medkit_already_in_use(pname)
-    end
-    
-    bandages.play_sound_effects(user:get_pos(), level)
-  
-    bandages.players[pname] = {pos=user:get_pos()}
-    minetest.after(bandages.delay_from_level(level), function()
-      local pos = bandages.players[pname].pos
-      bandages.players[pname] = nil
-      local user = minetest.get_player_by_name(pname)
-      if not user or not user:is_player() then return end
-      if vector_distance(user:get_pos(), pos) > bandages.movement_limit_from_level(level) then
-        return bandages.player_moved_too_much(pname)
-      end
-			-- Don't heal user if already dead.
-			-- This solves an exploit people have found.
-			if user:get_hp() == 0 then return end
-      user:set_hp(hp + bandages.hp_from_level(level))
-      bandages.player_bandages_self(pname, user:get_hp(), hp_max)
-    end)
-    
-    itemstack:take_item()
-    return itemstack
+		return bandages.heal_target(itemstack, user, target, level)
+  else
+		return bandages.heal_self(itemstack, user, level)
   end
 end
 

mods/beds/functions.lua

@@ -261,6 +261,21 @@ function beds.report_respawn_status(name)
 	end
 end
 
+
+
+function beds.get_respawn_count(pname)
+	local pos = beds.spawn[pname]
+  if pos then
+		local spawncount = beds.storage:get_int(pname .. ":count")
+    if spawncount > 0 then
+			return spawncount
+		end
+	end
+	return 0
+end
+
+
+
 local function node_blocks_bed(nn)
   if nn == "air" then return false end
 

mods/bones/depends.txt

@@ -1,2 +1,3 @@
 default
 reload
+falldamage

mods/bones/functions.lua

@@ -14,8 +14,9 @@ local get_public_time = function()
   return os.date("!%Y/%m/%d, %H:%M:%S UTC")
 end
 
-local share_bones_time = tonumber(minetest.setting_get("share_bones_time")) or 1200
-local share_bones_time_early = tonumber(minetest.setting_get("share_bones_time_early")) or share_bones_time / 4
+local share_bones_time = 1200
+local share_bones_time_early = (share_bones_time * 0.75)
+local share_bones_time_city = (share_bones_time * 10.0)
 
 
 
@@ -447,12 +448,7 @@ bones.on_dieplayer = function(player, reason, preserve_xp)
 			">'s Undecayed Bones\nMineral XP: " .. string.format("%.2f", xp_for_bones) .. "\n" ..
 			"Died On " .. meta:get_string("diedate"))
 
-		if share_bones_time_early == 0 or not minetest.test_protection(pos, "") then
-			meta:set_int("time", 0)
-		else
-			meta:set_int("time", (share_bones_time - share_bones_time_early))
-		end
-
+		meta:set_int("time", 0)
 		minetest.get_node_timer(pos):start(10)
 	else
 		meta:set_string("infotext",
@@ -700,9 +696,20 @@ end
 
 bones.on_timer = function(pos, elapsed)
 	local meta = minetest.get_meta(pos)
-	local digxp = string.format("%.2f", meta:get_float("digxp"))
 	local time = meta:get_int("time") + elapsed
-	if time >= share_bones_time then
+	local share_time = share_bones_time
+
+	-- If bones are in a protected area, they can be shared earlier than normal.
+	if minetest.test_protection(pos, "") then
+		share_time = share_bones_time_early
+	end
+
+	-- But if bones are in city, preserve them a lot longer.
+	if city_block:in_city(pos) then
+		share_time = share_bones_time_city
+	end
+
+	if time >= share_time then
 		-- Function may have been called twice or more. This prevents an issue.
 		if meta:get_string("owner") == "" then
 			return
@@ -714,12 +721,14 @@ bones.on_timer = function(pos, elapsed)
 		if not sheriff.is_cheater(meta:get_string("owner")) then
 			local cheaters_are_present = false
 			local all_players = minetest.get_connected_players()
+
 			for k, v in ipairs(all_players) do
 				if sheriff.is_cheater(v:get_player_name()) then
 					cheaters_are_present = true
 					break
 				end
 			end
+
 			if cheaters_are_present then
 				local timer = minetest.get_node_timer(pos)
 				timer:start(60*math_random(10, 60))
@@ -732,6 +741,7 @@ bones.on_timer = function(pos, elapsed)
 		if diedate == "" then
 			diedate = "An Unknown Date"
 		end
+		local digxp = string.format("%.2f", meta:get_float("digxp"))
 		meta:set_string("infotext",
 			"Unfortunate <" .. rename.gpn(meta:get_string("owner")) ..
 			">'s Old Bones\nMineral XP: " .. digxp .. "\n" ..

mods/cans/init.lua

@@ -180,6 +180,28 @@ minetest.register_craft({
   }
 })
 
+cans.register_can({
+  can_name = "cans:river_water_can",
+  can_description = "Salt Water Can",
+  can_inventory_image = "technic_river_water_can.png",
+  can_capacity = 16,
+  liquid_source_name = "default:river_water_source",
+  liquid_flowing_name = "default:river_water_flowing",
+	place_name = "default:river_water_source",
+})
+
+minetest.register_craft({
+  type   = "shapeless",
+  output = "cans:river_water_can",
+  recipe = {"cans:water_can"},
+})
+
+minetest.register_craft({
+  type   = "shapeless",
+  output = "cans:water_can",
+  recipe = {"cans:river_water_can"},
+})
+
 
 
 cans.register_can({