EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-01-19 08:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Adding more combat messages to Action Bar

Browse Source
This commit is contained in:
nossr50 2019-01-13 22:21:16 -08:00
parent 1cf1c6fab8
commit ba5428ff12
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java
View File

@ -5,6 +5,8 @@ import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.util.player.NotificationManager;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
@ -48,7 +50,7 @@ public class BleedTimerTask extends BukkitRunnable {
entry.setValue(entry.getValue() - 1); entry.setValue(entry.getValue() - 1);
if (entry.getValue() <= 0) { if (entry.getValue() <= 0) {
player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleeding.Stopped")); NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE, "Swords.Combat.Bleeding.Stopped");
} }
} }
else { else {

6
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -4,7 +4,9 @@ import java.util.EnumMap;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.util.player.NotificationManager;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.AnimalTamer;
@ -416,7 +418,7 @@ public final class CombatUtils {
switch (type) { switch (type) {
case SWORDS: case SWORDS:
if (entity instanceof Player) { if (entity instanceof Player) {
((Player) entity).sendMessage(LocaleLoader.getString("Swords.Combat.SS.Struck")); NotificationManager.sendPlayerInformation((Player)entity, NotificationType.SUBSKILL_MESSAGE, "Swords.Combat.SS.Struck");
} }
BleedTimerTask.add(livingEntity, Swords.serratedStrikesBleedTicks); BleedTimerTask.add(livingEntity, Swords.serratedStrikesBleedTicks);
@ -424,7 +426,7 @@ public final class CombatUtils {
case AXES: case AXES:
if (entity instanceof Player) { if (entity instanceof Player) {
((Player) entity).sendMessage(LocaleLoader.getString("Axes.Combat.SS.Struck")); NotificationManager.sendPlayerInformation((Player)entity, NotificationType.SUBSKILL_MESSAGE, "Axes.Combat.SS.Struck");
} }
break; break;