Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2024-09-24 04:02:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix command overrides. Fixes #89

Browse Source
This commit is contained in:
bloodshot 2019-12-28 17:39:27 -05:00
parent 9bd3436a55
commit ff27faa69c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sponge/src/main/java/com/griefdefender/GDBootstrap.java
View File

@ -61,7 +61,7 @@
import java.util.Map;
@Plugin(id = "griefdefender", name = "GriefDefender", version = "1.2.4", description = "Designed to defend world from all types of grief.",
authors = {"bloodmc"}, dependencies = {@Dependency(id = "luckperms", optional = true)})
authors = {"bloodmc"}, dependencies = {@Dependency(id = "luckperms")})
public class GDBootstrap {
@Inject public PluginContainer pluginContainer;

4
sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
View File

@ -300,10 +300,10 @@ public void onPlayerCommand(SendCommandEvent event, @First Player player) {
if (GDFlags.COMMAND_EXECUTE && !commandExecuteSourceBlacklisted && !commandExecuteTargetBlacklisted) {
// First check base command
Tristate result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandBaseTarget, player);
Tristate result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandBaseTarget, player, true);
if (result != Tristate.FALSE) {
// check with args
result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandTargetWithArgs, player);
result = GDPermissionManager.getInstance().getFinalPermission(event, player.getLocation(), claim, GDPermissions.COMMAND_EXECUTE, event.getSource(), commandTargetWithArgs, player, true);
}
if (result == Tristate.FALSE) {
final Component denyMessage = GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.COMMAND_BLOCKED,