SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix retaliation combat and make the message nicer to see

Browse Source
This commit is contained in:
libraryaddict 2020-02-04 16:06:34 +13:00
parent e2f80811ff
commit 4af9da10c5
No known key found for this signature in database
GPG Key ID: 052E4FBCD257AEA4
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/libraryaddict/disguise/DisguiseListener.java
View File

@ -245,7 +245,7 @@ public class DisguiseListener implements Listener {
if (!attacker.hasPermission("libsdisguises." + (pvp ? "pvp" : "pve")) && if (!attacker.hasPermission("libsdisguises." + (pvp ? "pvp" : "pve")) &&
!attacker.hasPermission("libsdisguises." + (pvp ? "pvp" : "pve"))) { !attacker.hasPermission("libsdisguises." + (pvp ? "pvp" : "pve"))) {
if (!DisguiseConfig.isRetaliationCombat() || !canRetaliate(event.getEntity())) { if (!DisguiseConfig.isRetaliationCombat() || !canRetaliate(attacker)) {
Disguise[] disguises = DisguiseAPI.getDisguises(attacker); Disguise[] disguises = DisguiseAPI.getDisguises(attacker);
if (disguises.length > 0) { if (disguises.length > 0) {
@ -273,12 +273,10 @@ public class DisguiseListener implements Listener {
} }
if (!event.isCancelled() && DisguiseConfig.isRetaliationCombat()) { if (!event.isCancelled() && DisguiseConfig.isRetaliationCombat()) {
if (canRetaliate(event.getEntity())) {
setRetaliation(event.getEntity()); setRetaliation(event.getEntity());
setRetaliation(attacker); setRetaliation(attacker);
} }
} }
}
@EventHandler @EventHandler
public void onChunkUnload(ChunkUnloadEvent event) { public void onChunkUnload(ChunkUnloadEvent event) {

2
src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java
View File

@ -245,7 +245,7 @@ public enum LibsMsg {
ChatColor.GOLD + "Lib's Disguises permission check, success. Pig disguise should be usable!"), ChatColor.GOLD + "Lib's Disguises permission check, success. Pig disguise should be usable!"),
LIBS_PERM_CHECK_FAIL( LIBS_PERM_CHECK_FAIL(
ChatColor.GOLD + "Lib's Disguises permission check, fail. Your permission plugin isn't compliant!"), ChatColor.GOLD + "Lib's Disguises permission check, fail. Your permission plugin isn't compliant!"),
CANT_ATTACK_DISGUISED(ChatColor.RED + "No PvP while disguised!"), CANT_ATTACK_DISGUISED(ChatColor.RED + "Cannot fight while disguised!"),
CANT_ATTACK_DISGUISED_RECENTLY(ChatColor.RED + "You were disguised recently! Can't attack yet!"), CANT_ATTACK_DISGUISED_RECENTLY(ChatColor.RED + "You were disguised recently! Can't attack yet!"),
SWITCH_WORLD_DISGUISE_REMOVED(ChatColor.RED + "Disguise removed as you've switched worlds!"), SWITCH_WORLD_DISGUISE_REMOVED(ChatColor.RED + "Disguise removed as you've switched worlds!"),
ACTION_BAR_MESSAGE(ChatColor.GOLD + "Currently disguised as %s"); ACTION_BAR_MESSAGE(ChatColor.GOLD + "Currently disguised as %s");