From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Sun, 10 May 2020 15:31:51 +0000 (+0200)
Subject: Several Ajustments
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=ec9f3662706512c2086a7509e58cdc37fcacb443;p=elidragon.git

Several Ajustments
---

diff --git a/birthday.lua b/birthday.lua
old mode 100644
new mode 100755
diff --git a/misc.lua b/misc.lua
index 57c5db2..18d600e 100755
--- a/misc.lua
+++ b/misc.lua
@@ -8,8 +8,8 @@ minetest.register_on_joinplayer(function(player)
     minetest.chat_send_player(player:get_player_name(), 
         minetest.colorize("#D6CD00", " ELIDRAGON") .. "\n" ..
         minetest.colorize("#6076FF"," Join our discord Server (discord.gg/Z7SfXYx) or our IRC channel (#elidragon-skyblocks on irc.edgy1.net)") .. "\n" ..
-        minetest.colorize("#E27900", " Go to hub using /hub !") .. "\n" ..
-        minetest.colorize("#00F0FF", " Use /island to teleport to your island!") .. "\n" ..
+        minetest.colorize("#E27900", " Go to hub using /hub") .. "\n" ..
+        minetest.colorize("#00F0FF", " Use /island to teleport to your island") .. "\n" ..
         minetest.colorize("#83FF00", " NEWS: ") .. minetest.colorize("#FFFFFF", elidragon.savedata.news or "No current News")
 	)
 end)
diff --git a/mod.conf b/mod.conf
new file mode 100644
index 0000000..6eef54f
--- /dev/null
+++ b/mod.conf
@@ -0,0 +1,5 @@
+name = elidragon
+description = The plugins for the Elidragon Server
+author = Fleckenstein
+depends = worldedit, moreores, moretrees, default, flowers
+optional_depends = irc
diff --git a/ranks.lua b/ranks.lua
index 35480f2..8fc6f7a 100755
--- a/ranks.lua
+++ b/ranks.lua
@@ -70,7 +70,7 @@ end
 minetest.register_on_joinplayer(function(player)
 	local name = player:get_player_name()
     minetest.chat_send_all(elidragon.get_player_name(name, true) .. "has joined the Server.")
-    if irc.connected and irc.config.send_join_part then
+    if irc and irc.connected and irc.config.send_join_part then
         irc.say(elidragon.get_player_name(name) .. "has joined the Server.")
     end
     player:set_nametag_attributes({color = elidragon.get_rank(name).color})
@@ -79,14 +79,14 @@ end)
 minetest.register_on_leaveplayer(function(player)
 	local name = player:get_player_name()
     minetest.chat_send_all(elidragon.get_player_name(name, true) .. "has left the Server.")
-    if irc.connected and irc.config.send_join_part then
+    if irc and irc.connected and irc.config.send_join_part then
         irc.say(elidragon.get_player_name(name) .. "has left the Server.")
     end
 end)
 
 minetest.register_on_chat_message(function(name, message)
     minetest.chat_send_all(elidragon.get_player_name(name, true, {"<", ">"}) .. message)
-    if irc.connected and irc.joined_players[name] then
+    if irc and irc.connected and irc.joined_players[name] then
         irc.say(elidragon.get_player_name(name, false, {"<", ">"}) .. message)
     end
     return true
diff --git a/schems/island.we b/schems/island.we
old mode 100644
new mode 100755
diff --git a/skyblock.lua b/skyblock.lua
index 7e4534f..5d73357 100755
--- a/skyblock.lua
+++ b/skyblock.lua
@@ -53,9 +53,9 @@ end
 function elidragon.skyblock.load_start_positions()
 	local file = io.open(minetest.get_worldpath() .. "/start_positions", "r")
 	if file then
-		local data = minetest.deserialize(file:read())
+		local start_positions = minetest.deserialize(file:read())
 		file:close()
-		return data
+		return start_positions
 	end
 end
 
diff --git a/textures/elidragon_quest.png b/textures/elidragon_quest.png
old mode 100644
new mode 100755