8 Ревизии 0fe19fa172 ... e320541bf3

Автор SHA1 Съобщение Дата
  Fedja Beader e320541bf3 Enable city haters to claim victory without having to step into one. преди 2 години
  BluebirdGreycoat 1bffbd2db3 Just to make sure ... преди 2 години
  BlueBird51 d1338c5299 Merge branch 'master' of boxface/musttest_game into master преди 2 години
  BlueBird51 7c834dd3d2 Merge branch 'remove-proprietary-media' of noisytoot/musttest_game into master преди 2 години
  BluebirdGreycoat 4d0324abe9 rock drills are battery powered, require battery in crafting them. преди 2 години
  BluebirdGreycoat 8d87648610 Textually minor but consequential oversight преди 2 години
  Ron Nazarov 610362f365 Remove unused proprietary media преди 2 години
  boxface efc4e24ee7 request insecure environment to load lsqlite3 преди 2 години

+ 1 - 0
mods/bones/depends.txt

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

+ 1 - 0
mods/chests/depends.txt

@@ -2,3 +2,4 @@ coresounds
 utility
 guicolors
 chest_api
+falldamage

+ 11 - 1
mods/email/init.lua

@@ -187,7 +187,17 @@ end
 
 
 if not email.registered then
-	email.sql = require("lsqlite3")
+	-- load insecure environment
+	local secenv = minetest.request_insecure_environment()
+	if secenv then
+		print("[email] insecure environment loaded.")
+		email.sql = secenv.require("lsqlite3")
+		assert(email.sql, "lsqlite3 failed to load")
+	else
+		minetest.log("error", "[email] Failed to load insecure environment," ..
+				" please add this mod to the trusted mods list.")
+	end
+
   -- Don't allow other mods to use this global library!
   if sqlite3 then sqlite3 = nil end
 

+ 4 - 3
mods/morechests/depends.txt

@@ -1,6 +1,7 @@
 default
-reload?
-moretrees?
-easyvend?
+reload
+moretrees
+easyvend
 coresounds
 chest_api
+falldamage

+ 14 - 2
mods/networks/init.lua

@@ -1,6 +1,18 @@
 
-networks = networks or {}
-networks.modpath = minetest.get_modpath("networks")
+if not minetest.global_exists("networks") then
+	networks = {}
+	networks.modpath = minetest.get_modpath("networks")
+	
+	-- load insecure environment
+	local secenv = minetest.request_insecure_environment()
+	if secenv then
+		print("[networks] insecure environment loaded.")
+		networks.sql = secenv.require("lsqlite3")
+	else
+		minetest.log("error", "[networks] failed to load insecure" ..
+				" environment, please add this mod to the trusted mods list.")
+	end
+end
 
 
 

+ 3 - 1
mods/networks/nodestore.lua

@@ -355,7 +355,9 @@ end
 -- One-time execution goes here.
 if not nodestore.run_once then
 	-- Obtain library for database access.
-	nodestore.sql = require("lsqlite3")
+	-- lsqlite3 loaded on init file for security
+	--nodestore.sql = require("lsqlite3")
+	nodestore.sql = networks.sql
 	assert(nodestore.sql)
 
 	-- Don't allow other mods to use this global library!

+ 6 - 2
mods/survivalist/init.lua

@@ -530,7 +530,8 @@ function survivalist.attempt_claim(pname)
   -- Check if the player is in the city.
   local pos = player:get_pos()
   local cityname = ""
-  
+  local home_pos = minetest.string_to_pos(survivalist.modstorage:get_string(pname .. ":home"))
+
   -- The position and name of the city the player claims victory in.
   local finalcitypos
   if vector_distance(pos, surfacecitypos) <= 20 then
@@ -539,10 +540,13 @@ function survivalist.attempt_claim(pname)
   elseif vector_distance(pos, nethercitypos) <= 20 then
     finalcitypos = table.copy(nethercitypos)
     cityname = "Nether City"
+  elseif vector_distance(pos, home_pos) <= 20 then
+    finalcitypos = table.copy(home_pos)
+    cityname = "place they started"
   end
   
   if not finalcitypos then
-    minetest.chat_send_player(pname, "# Server: You must be within 20 meters of the main square of the Surface Colony or the Nether City in order to claim victory!")
+    minetest.chat_send_player(pname, "# Server: You must be within 20 meters of the main square of the Surface Colony or the Nether City or the place where you started the challenge in order to claim victory!")
 		easyvend.sound_error(pname)
     return
   end

+ 0 - 2
mods/xdecor/LICENSE

@@ -6,8 +6,6 @@
 │   Sounds:	                                                       │
 │     - xdecor_boiling_water.ogg - by Audionautics - CC BY-SA          │
 │	   freesound.org/people/Audionautics/sounds/133901/ 	       │
-│     - xdecor_enchanting.ogg - by Timbre - CC BY-SA-NC                │
-│          freesound.org/people/Timbre/sounds/221683/                  │
 │     - xdecor_bouncy.ogg - by Blender Foundation - CC BY 3.0	       │
 │	   opengameart.org/content/funny-comic-cartoon-bounce-sound    │
 └──────────────────────────────────────────────────────────────────────┘

BIN
mods/xdecor/sounds/xdecor_enchanting.ogg