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

Attempt to fix #80

Browse Source 
It is very likely I didn't. But when inspecting the code I have absolutely no clue how it could even happen in the first place. Anyhow, if it happens again I'll probably have better debug now.
This commit is contained in:
Magnus Ulf 2021-03-02 21:53:45 +01:00
parent 94b424b8dc
commit f440e48435
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/massivecraft/factions/engine/EngineMain.java
View File

@ -1,17 +0,0 @@
package com.massivecraft.factions.engine;
import com.massivecraft.massivecore.ps.PS;
public class EngineMain
{
/**
* @deprecated moved to EnginePermBuild
*/
public static boolean canPlayerBuildAt(Object senderObject, PS ps, boolean verboose)
{
Boolean ret = EnginePermBuild.protect(ProtectCase.BUILD, verboose, senderObject, ps, null, null);
return ret == null || !ret;
}
}

16
src/com/massivecraft/factions/engine/EnginePermBuild.java
View File

@ -84,9 +84,9 @@ public class EnginePermBuild extends Engine
return !perm.has(mplayer, ps, verboose); return !perm.has(mplayer, ps, verboose);
} }
public static Boolean protect(ProtectCase protectCase, boolean verboose, Object senderObject, PS ps, Object object, Cancellable cancellable) public static Boolean protect(ProtectCase protectCase, boolean verboose, Player player, PS ps, Object object, Cancellable cancellable)
{ {
Boolean ret = isProtected(protectCase, verboose, MPlayer.get(senderObject), ps, object); Boolean ret = isProtected(protectCase, verboose, MPlayer.get(player), ps, object);
if (Boolean.TRUE.equals(ret) && cancellable != null) cancellable.setCancelled(true); if (Boolean.TRUE.equals(ret) && cancellable != null) cancellable.setCancelled(true);
return ret; return ret;
@ -96,16 +96,17 @@ public class EnginePermBuild extends Engine
{ {
if (!(event instanceof Cancellable)) return true; if (!(event instanceof Cancellable)) return true;
if (MUtil.isntPlayer(entity)) return false; if (MUtil.isntPlayer(entity)) return false;
Player player = (Player) entity;
boolean verboose = !isFake(event); boolean verboose = !isFake(event);
return protect(ProtectCase.BUILD, verboose, entity, PS.valueOf(block), block, (Cancellable) event); return protect(ProtectCase.BUILD, verboose, player, PS.valueOf(block), block, (Cancellable) event);
} }
public static Boolean useItem(Entity entity, Block block, Material material, Cancellable cancellable) public static Boolean useItem(Player player, Block block, Material material, Cancellable cancellable)
{ {
return protect(ProtectCase.USE_ITEM, true, entity, PS.valueOf(block), material, cancellable); return protect(ProtectCase.USE_ITEM, true, player, PS.valueOf(block), material, cancellable);
} }
public static Boolean useEntity(Entity player, Entity entity, boolean verboose, Cancellable cancellable) public static Boolean useEntity(Player player, Entity entity, boolean verboose, Cancellable cancellable)
{ {
return protect(ProtectCase.USE_ENTITY, verboose, player, PS.valueOf(entity), entity, cancellable); return protect(ProtectCase.USE_ENTITY, verboose, player, PS.valueOf(entity), entity, cancellable);
} }
@ -249,6 +250,7 @@ public class EnginePermBuild extends Engine
// ... fired by a player ... // ... fired by a player ...
ProjectileSource projectileSource = entityProjectile.getShooter(); ProjectileSource projectileSource = entityProjectile.getShooter();
if (MUtil.isntPlayer(projectileSource)) return; if (MUtil.isntPlayer(projectileSource)) return;
Player player = (Player) projectileSource;
// ... and hits an entity which is edited on damage (and thus likely to burn) ... // ... and hits an entity which is edited on damage (and thus likely to burn) ...
Entity entityTarget = event.getEntity(); Entity entityTarget = event.getEntity();
@ -256,7 +258,7 @@ public class EnginePermBuild extends Engine
// ... and the player can't build there, cancel the event // ... and the player can't build there, cancel the event
Block block = entityTarget.getLocation().getBlock(); Block block = entityTarget.getLocation().getBlock();
protect(ProtectCase.BUILD, false, projectileSource, PS.valueOf(block), block, event); protect(ProtectCase.BUILD, false, player, PS.valueOf(block), block, event);
} }
// -------------------------------------------- // // -------------------------------------------- //