]> git.lizzy.rs Git - elidragon.git/commitdiff
Several Ajustments
authorElias Fleckenstein <eliasfleckenstein@web.de>
Sun, 10 May 2020 15:31:51 +0000 (17:31 +0200)
committerElias Fleckenstein <eliasfleckenstein@web.de>
Sun, 10 May 2020 15:31:51 +0000 (17:31 +0200)
birthday.lua [changed mode: 0644->0755]
misc.lua
mod.conf [new file with mode: 0644]
ranks.lua
schems/island.we [changed mode: 0644->0755]
skyblock.lua
textures/elidragon_quest.png [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 57c5db2526eea88aa43de2e22d12f03c3266331a..18d600edac5eb0ebd927759b6763aa9bb310d2ab 100755 (executable)
--- 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 (file)
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
index 35480f23380829712b4cdb1acef4ff6f3343176d..8fc6f7a80ca47f43c1fb32a233a7e31cc0ac27d3 100755 (executable)
--- 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
old mode 100644 (file)
new mode 100755 (executable)
index 7e4534fdafad2b06df145f5a0aff159d81a38818..5d733579d920cbf2ecbe00b2d13c02964c3aa7ab 100755 (executable)
@@ -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
 
old mode 100644 (file)
new mode 100755 (executable)