Support more sender object types in the canPlayerBuildAt method. Makes it possible to check offline player rights too.

This commit is contained in:
Olof Larsson 2014-09-19 09:30:08 +02:00
parent 72da80bfa0
commit cfc95f4895

View File

@ -707,12 +707,14 @@ public class FactionsListenerMain implements Listener
// FLAG: BUILD // FLAG: BUILD
// -------------------------------------------- // // -------------------------------------------- //
public static boolean canPlayerBuildAt(Player player, PS ps, boolean verboose) public static boolean canPlayerBuildAt(Object senderObject, PS ps, boolean verboose)
{ {
String name = player.getName(); MPlayer mplayer = MPlayer.get(senderObject);
if (mplayer == null) return false;
String name = mplayer.getName();
if (MConf.get().playersWhoBypassAllProtection.contains(name)) return true; if (MConf.get().playersWhoBypassAllProtection.contains(name)) return true;
MPlayer mplayer = MPlayer.get(player);
if (mplayer.isUsingAdminMode()) return true; if (mplayer.isUsingAdminMode()) return true;
if (!FPerm.BUILD.has(mplayer, ps, false) && FPerm.PAINBUILD.has(mplayer, ps, false)) if (!FPerm.BUILD.has(mplayer, ps, false) && FPerm.PAINBUILD.has(mplayer, ps, false))
@ -721,8 +723,12 @@ public class FactionsListenerMain implements Listener
{ {
Faction hostFaction = BoardColl.get().getFactionAt(ps); Faction hostFaction = BoardColl.get().getFactionAt(ps);
mplayer.msg("<b>It is painful to build in the territory of %s<b>.", hostFaction.describeTo(mplayer)); mplayer.msg("<b>It is painful to build in the territory of %s<b>.", hostFaction.describeTo(mplayer));
Player player = mplayer.getPlayer();
if (player != null)
{
player.damage(MConf.get().actionDeniedPainAmount); player.damage(MConf.get().actionDeniedPainAmount);
} }
}
return true; return true;
} }
@ -746,7 +752,7 @@ public class FactionsListenerMain implements Listener
Entity breaker = entityEvent.getRemover(); Entity breaker = entityEvent.getRemover();
if (! (breaker instanceof Player)) return; if (! (breaker instanceof Player)) return;
if ( ! canPlayerBuildAt((Player)breaker, PS.valueOf(event.getEntity()), true)) if ( ! canPlayerBuildAt(breaker, PS.valueOf(event.getEntity()), true))
{ {
event.setCancelled(true); event.setCancelled(true);
} }