Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply build trust for entity containers.

Browse Source
This commit is contained in:
Len 2022-08-28 17:49:58 +02:00
parent 20b341e46a
commit a2954e8795
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -89,6 +89,7 @@ import org.bukkit.event.hanging.HangingBreakEvent;
import org.bukkit.event.hanging.HangingBreakEvent.RemoveCause; import org.bukkit.event.hanging.HangingBreakEvent.RemoveCause;
import org.bukkit.event.hanging.HangingPlaceEvent; import org.bukkit.event.hanging.HangingPlaceEvent;
import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.event.vehicle.VehicleDamageEvent;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.metadata.MetadataValue; import org.bukkit.metadata.MetadataValue;
@ -1354,13 +1355,26 @@ public class EntityEventHandler implements Listener
message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement);
return message; return message;
}; };
Supplier<String> noContainersReason = claim.checkPermission(attacker, ClaimPermission.Inventory, event, override); //for storage entities, apply container rules (this is a potential theft)
if (noContainersReason != null) if (event.getVehicle() instanceof InventoryHolder)
{ {
event.setCancelled(true); Supplier<String> noContainersReason = claim.checkPermission(attacker, ClaimPermission.Build, event);
GriefPrevention.sendMessage(attacker, TextMode.Err, noContainersReason.get()); if (noContainersReason != null)
{
GriefPrevention.sendMessage(attacker, TextMode.Err, noContainersReason.get());
event.setCancelled(true);
return;
}
}
else
{
Supplier<String> noContainersReason = claim.checkPermission(attacker, ClaimPermission.Inventory, event, override);
if (noContainersReason != null)
{
event.setCancelled(true);
GriefPrevention.sendMessage(attacker, TextMode.Err, noContainersReason.get());
}
} }
//cache claim for later //cache claim for later
if (playerData != null) if (playerData != null)
{ {