Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug with the smoke effect for the faction home and one NPE.

Browse Source
This commit is contained in:
Olof Larsson 2011-10-13 22:49:41 +02:00
parent 88fe43d600
commit 618c5fceed
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/FPlayer.java
View File

@ -391,13 +391,13 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
@Override
public String describeTo(RelationParticipator that, boolean ucfirst)
{
return RelationUtil.describeThatToMe(that, this, ucfirst);
return RelationUtil.describeThatToMe(this, that, ucfirst);
}
@Override
public String describeTo(RelationParticipator that)
{
return RelationUtil.describeThatToMe(that, this);
return RelationUtil.describeThatToMe(this, that);
}
@Override

4
src/com/massivecraft/factions/cmd/CmdHome.java
View File

@ -131,9 +131,9 @@ public class CmdHome extends FCommand
{
List<Location> smokeLocations = new ArrayList<Location>();
smokeLocations.add(me.getLocation());
smokeLocations.add(me.getLocation().add(0, 1, 0));
smokeLocations.add(me.getLocation().clone().add(0, 1, 0));
smokeLocations.add(myFaction.getHome());
smokeLocations.add(myFaction.getHome().add(0, 1, 0));
smokeLocations.add(myFaction.getHome().clone().add(0, 1, 0));
SmokeUtil.spawnCloudRandom(smokeLocations, Conf.homesTeleportCommandSmokeEffectThickness);
}

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

@ -96,7 +96,7 @@ public class Econ
// Bypassing players can do any kind of transaction
if (i instanceof FPlayer && ((FPlayer)i).isAdminBypassing()) return true;
// Players with the any withdraw can to.
// Players with the any withdraw can do.
if (i instanceof FPlayer && Permission.MONEY_WITHDRAW_ANY.has(((FPlayer)i).getPlayer())) return true;
// You can deposit to anywhere you feel like. It's your loss if you can't withdraw it again.

9
src/com/massivecraft/factions/util/RelationUtil.java
View File

@ -56,20 +56,17 @@ public class RelationUtil
return "" + getRelationColor(me, that) + ret;
}
public static String describeThatToMe(RelationParticipator that,
RelationParticipator me)
public static String describeThatToMe(RelationParticipator that, RelationParticipator me)
{
return describeThatToMe(that, me, false);
}
public static Relation getRelationTo(RelationParticipator me,
RelationParticipator that)
public static Relation getRelationTo(RelationParticipator me, RelationParticipator that)
{
return getRelationTo(that, me, false);
}
public static Relation getRelationTo(RelationParticipator me,
RelationParticipator that, boolean ignorePeaceful)
public static Relation getRelationTo(RelationParticipator me, RelationParticipator that, boolean ignorePeaceful)
{
Faction fthat = getFaction(that);
if (fthat == null) return Relation.NEUTRAL; // ERROR

4
src/com/massivecraft/factions/zcore/util/PermUtil.java
View File

@ -82,6 +82,8 @@ public class PermUtil {
*/
public boolean has (CommandSender me, String perm)
{
if (me == null) return false;
if ( ! (me instanceof Player))
{
return me.hasPermission(perm);
@ -108,7 +110,7 @@ public class PermUtil {
{
return true;
}
else if (informSenderIfNot)
else if (informSenderIfNot && me != null)
{
me.sendMessage(this.getForbiddenMessage(perm));
}