From a7c9d152824d5d6f248daf4e1bd2da12e837a4a2 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Sat, 27 Oct 2018 14:11:13 -0500 Subject: [PATCH] Claim error message fix. Used to say "Not enough power." for everything. --- chatcommands.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/chatcommands.lua b/chatcommands.lua index c830789..9482eb2 100644 --- a/chatcommands.lua +++ b/chatcommands.lua @@ -172,17 +172,17 @@ factions.register_command ("claim", { return true else local parcel_faction = factions.get_parcel_faction(parcelpos) - if faction.power <= factions_config.power_per_parcel then - send_error(player, "Not enough power.") + if parcel_faction and parcel_faction.name == faction.name then + send_error(player, "This parcel already belongs to your faction.") return false - elseif not parcel_faction then - send_error(player, "Your faction cannot claim any (more) parcel(s).") + elseif parcel_faction and parcel_faction.name ~= faction.name then + send_error(player, "This parcel belongs to another faction.") return false - elseif parcel_faction.name == faction.name then - send_error(player, "This parcel already belongs to your faction.") + elseif faction.power <= factions_config.power_per_parcel then + send_error(player, "Not enough power.") return false else - send_error(player, "This parcel belongs to another faction.") + send_error(player, "Your faction cannot claim any (more) parcel(s).") return false end end