From 167a245244debe8bcede6b16405cb46fcbb2b682 Mon Sep 17 00:00:00 2001 From: shamoanjac Date: Wed, 10 Aug 2016 02:13:40 +0200 Subject: [PATCH 1/4] Fixed on_spawn bug --- factions.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/factions.lua b/factions.lua index e1251da..f5e86fc 100644 --- a/factions.lua +++ b/factions.lua @@ -228,7 +228,7 @@ function factions.Faction.end_enemy(self, faction) end function factions.Faction.set_spawn(self, pos) self.spawn = {x=pos.x, y=pos.y, z=pos.z} - self:on_set_spawn() + self:on_set_spawn(pos) factions.save() end function factions.Faction.add_rank(self, rank, perms) From 1f67d1ed0114214474f1e1b8bbd3578fbdcac031 Mon Sep 17 00:00:00 2001 From: shamoanjac Date: Wed, 10 Aug 2016 02:42:31 +0200 Subject: [PATCH 2/4] Fixed newrank bug --- factions.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/factions.lua b/factions.lua index f5e86fc..4e0c37e 100644 --- a/factions.lua +++ b/factions.lua @@ -307,7 +307,7 @@ function factions.Faction.on_set_spawn(self) self:broadcast("The faction spawn has been set to ("..util.coords3D_string(pos)..").") end function factions.Faction.on_add_rank(self, rank) - self:broadcast("The rank "..rank.." has been created with privileges: "..table.concat(self.rank[rank])) + self:broadcast("The rank "..rank.." has been created with privileges: "..table.concat(self.ranks[rank])) end function factions.Faction.on_delete_rank(self, rank, newrank) self:broadcast("The rank "..rank.." has been deleted and replaced by "..newrank) From 3ec12936d61c0f6ba81a0ecb301b1c920921cd4c Mon Sep 17 00:00:00 2001 From: shamoanjac Date: Wed, 10 Aug 2016 02:43:31 +0200 Subject: [PATCH 3/4] Fixed formatting on /f newrank callback --- factions.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/factions.lua b/factions.lua index 4e0c37e..77eb45e 100644 --- a/factions.lua +++ b/factions.lua @@ -307,7 +307,7 @@ function factions.Faction.on_set_spawn(self) self:broadcast("The faction spawn has been set to ("..util.coords3D_string(pos)..").") end function factions.Faction.on_add_rank(self, rank) - self:broadcast("The rank "..rank.." has been created with privileges: "..table.concat(self.ranks[rank])) + self:broadcast("The rank "..rank.." has been created with privileges: "..table.concat(self.ranks[rank], ", ")) end function factions.Faction.on_delete_rank(self, rank, newrank) self:broadcast("The rank "..rank.." has been deleted and replaced by "..newrank) From be791384bd20af75bc13ea54fae2194c430d1d44 Mon Sep 17 00:00:00 2001 From: shamoanjac Date: Wed, 10 Aug 2016 02:46:54 +0200 Subject: [PATCH 4/4] Fixed add_player() and on_create --- factions.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/factions.lua b/factions.lua index 77eb45e..85f9750 100644 --- a/factions.lua +++ b/factions.lua @@ -96,9 +96,9 @@ function factions.Faction.decrease_power(self, power) end function factions.Faction.add_player(self, player, rank) + self:on_player_join(player) self.players[player] = rank or self.default_rank factions.players[player] = self.name - self:on_player_join(player) self.invited_players[player] = nil factions.save() end @@ -268,7 +268,7 @@ end -------------------------- -- callbacks for events -- function factions.Faction.on_create(self) --! @brief called when the faction is added to the global faction list - minetest.chat_send_all("Faction "..self.name" has been created.") + minetest.chat_send_all("Faction "..self.name.." has been created.") end function factions.Faction.on_player_leave(self, player) self:broadcast(player.." has left this faction.") @@ -283,7 +283,7 @@ function factions.Faction.on_unclaim_chunk(self, pos) self:broadcast("Chunk ("..pos..") has been unclaimed.") end function factions.Faction.on_disband(self, pos) - minetest.chat_send_all("Faction "..self.name.."has been disbanded.") + minetest.chat_send_all("Faction "..self.name.." has been disbanded.") end function factions.Faction.on_new_leader(self) self:broadcast(self.leader.." is now the leader of this faction.")