Skip to content

Commit 54ecd98

Browse files
committed
Merge with ThisTestUser
1 parent 4ab862c commit 54ecd98

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/main/java/com/solarrabbit/largeraids/command/RaiderAttackCommand.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.solarrabbit.largeraids.command;
22

33
import com.solarrabbit.largeraids.LargeRaids;
4-
import com.solarrabbit.largeraids.nms.AbstractRaiderWrapper;
54
import com.solarrabbit.largeraids.raid.LargeRaid;
65
import com.solarrabbit.largeraids.raid.RaidManager;
76

@@ -12,8 +11,6 @@
1211
import org.bukkit.command.Command;
1312
import org.bukkit.command.CommandExecutor;
1413
import org.bukkit.command.CommandSender;
15-
import org.bukkit.entity.EntityType;
16-
import org.bukkit.entity.Pillager;
1714
import org.bukkit.entity.Player;
1815

1916
/**
@@ -79,8 +76,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
7976
if (!largeRaid.get().addAttackGoal(prio, !thruWalls, entityClass))
8077
sender.sendMessage(ChatColor.RED + this.plugin.getMessage("raider-attack.invalid-entity-class"));
8178
else
82-
sender.sendMessage(ChatColor.GREEN + this.plugin.getMessage("raider-attack.attack-goal-set"));
83-
84-
return true;
79+
sender.sendMessage(ChatColor.GREEN + String.format(this.plugin.getMessage("raider-attack.attack-goal-set"),
80+
entityClass.getSimpleName()));
8581
}
8682
}

src/main/resources/messages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,4 @@ raider-attack:
7676
class-not-found: The specified class was not found!
7777
invalid-entity-class: The specified class is not of LivingEntity type!
7878
attack-goal-set: All raiders of the current wave will now target the specified entity type.
79+
attack-goal-set: All raiders of the current wave will now target entity %s.

src/main/resources/plugin.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ permissions:
5454
largeraids.centers: true
5555
largeraids.glow: true
5656
largeraids.show: true
57+
largeraids.attack: true
5758
largeraids.reload:
5859
description: Allow access to lrreload command.
5960
default: op

0 commit comments

Comments
 (0)