EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing a string format error and possibly solving a money rights issue

Browse Source
This commit is contained in:
Olof Larsson
2011-10-23 02:43:25 +02:00
parent 2ac96f4278
commit 32624e0339
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/massivecraft/factions/integration/Econ.java
View File

@@ -86,11 +86,11 @@ public class Econ
public static boolean canIControllYou(EconomyParticipator i, EconomyParticipator you) public static boolean canIControllYou(EconomyParticipator i, EconomyParticipator you)
{ {
Faction fInvoker = RelationUtil.getFaction(i); Faction fI = RelationUtil.getFaction(i);
Faction fFrom = RelationUtil.getFaction(you); Faction fYou = RelationUtil.getFaction(you);
// This is a system invoker. Accept it. // This is a system invoker. Accept it.
if (fInvoker == null) return true; if (fI == null) return true;
// Bypassing players can do any kind of transaction // Bypassing players can do any kind of transaction
if (i instanceof FPlayer && ((FPlayer)i).isAdminBypassing()) return true; if (i instanceof FPlayer && ((FPlayer)i).isAdminBypassing()) return true;
@@ -104,10 +104,10 @@ public class Econ
// A faction can always transfer away the money of it's members and its own money... // A faction can always transfer away the money of it's members and its own money...
// This will however probably never happen as a faction does not have free will. // This will however probably never happen as a faction does not have free will.
// Ohh by the way... Yes it could. For daily rent to the faction. // Ohh by the way... Yes it could. For daily rent to the faction.
if (i == fInvoker && fInvoker == fFrom) return true; if (i == fI && fI == fYou) return true;
// If you are part of the same faction as from and members can withdraw or you are at least moderator... then it is ok. // Factions can be controlled by members that are moderators... or any member if any member can withdraw.
if (fInvoker == fFrom && (Conf.bankMembersCanWithdraw || ((FPlayer)i).getRole().value >= Role.MODERATOR.value)) return true; if (you instanceof Faction && fI == fYou && (Conf.bankMembersCanWithdraw || ((FPlayer)i).getRole().value >= Role.MODERATOR.value)) return true;
// Otherwise you may not! ;,,; // Otherwise you may not! ;,,;
i.msg("<h>%s<i> lack permission to controll <h>%s's<i> money.", i.describeTo(i, true), you.describeTo(i)); i.msg("<h>%s<i> lack permission to controll <h>%s's<i> money.", i.describeTo(i, true), you.describeTo(i));

3
src/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@@ -2,7 +2,6 @@ package com.massivecraft.factions.listeners;
import java.text.MessageFormat; import java.text.MessageFormat;
import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Creeper; import org.bukkit.entity.Creeper;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@@ -362,7 +361,7 @@ public class FactionsEntityListener extends EntityListener
// Send message // Send message
String perc = MessageFormat.format("{0,number,#%}", (Conf.territoryShieldFactor)); // TODO does this display correctly?? String perc = MessageFormat.format("{0,number,#%}", (Conf.territoryShieldFactor)); // TODO does this display correctly??
defender.msg("<i>Enemy damage reduced by "+ChatColor.RED+perc+"<i>."); defender.msg("<i>Enemy damage reduced by <rose>%s<i>.", perc);
} }
return true; return true;