YouHaveTrouble/YardWatch
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/YardWatch.git synced 2026-05-12 06:26:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve FUUID support: (#7)

Browse Source 
Don't waste time if not in an enabled world.
Fixes test for protection that would always return true.
Fixes block use test to use more proper method.
This commit is contained in:
Matt Baxter
2025-09-27 17:12:52 -04:00
committed by GitHub
parent a2d676044c
commit c30c3ee7c9
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/youhavetrouble/yardwatch/hooks/FactionsUUIDProtection.java
+12 -2
View File
@@ -35,12 +35,13 @@ public class FactionsUUIDProtection implements Protection {
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(location.getWorld())) return false;
FLocation fLocation = new FLocation(location);
Faction faction = Board.getInstance().getFactionAt(fLocation);
return faction != null;
return !faction.isWilderness();
}
@Override
public boolean canBreakBlock(Player player, BlockState blockState) {
if (!isEnabled()) return true;
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(blockState.getWorld())) return true;
return FactionsBlockListener.playerCanBuildDestroyBlock(
player,
blockState.getLocation(),
@@ -52,6 +53,7 @@ public class FactionsUUIDProtection implements Protection {
@Override
public boolean canPlaceBlock(Player player, Location location) {
if (!isEnabled()) return true;
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(location.getWorld())) return true;
return FactionsBlockListener.playerCanBuildDestroyBlock(
player,
location,
@@ -63,18 +65,26 @@ public class FactionsUUIDProtection implements Protection {
@Override
public boolean canInteract(Player player, BlockState blockState) {
if (!isEnabled()) return true;
return FactionsPlayerListener.canInteractHere(player, blockState.getLocation());
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(blockState.getWorld())) return true;
return FactionsPlayerListener.canUseBlock(
player,
blockState.getType(),
blockState.getLocation(),
true
);
}
@Override
public boolean canInteract(Player player, Entity target) {
if (!isEnabled()) return true;
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(target)) return true;
return FactionsEntityListener.canInteractHere(player, target.getLocation());
}
@Override
public boolean canDamage(Entity damager, Entity target) {
if (!isEnabled()) return true;
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(target)) return true;
return FactionsEntityListener.canDamage(damager, target, false);
}
}