Merge pull request #245 from Diet-Cola/ep-add-health

Add pearl health to /ep locate
CivMC · Jun 9, 2024 · d414ff2 · d414ff2
2 parents bf0147a + 5c614e9
commit d414ff2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/Lang.java b/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/Lang.java
@@ -5,7 +5,7 @@ public class Lang
 	public static final String pearlCantHold = "<b>Pearled players can't pick up pearls.";
 	public static final String pearlMotd2 = "<i>Type \"<c>/pp locate<i>\" to locate your pearl.";
 	public static final String pearlNotExiled = "<i>You are not pearled.";
-	public static final String pearlPearlIsHeld = "<i>Your pearl is held by <a>%s <n>[%d %d %d %s]";
+	public static final String pearlPearlIsHeld = "<i>Your pearl is held by <a>%s <n>[%d %d %d %s]<i> at <a>%d <i>health!";
 	public static final String pearlYouBound = "<g>You've bound <c>%s <g>to a pearl!";
 	public static final String pearlYouWereBound = "<b>You've been bound to a pearl by <c>%s";
 	public static final String pearlYouWereFreed = "<g>You've been freed!";

diff --git a/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/CoreExilePearl.java b/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/CoreExilePearl.java
@@ -493,7 +493,7 @@ public void performBroadcast() {
 		Location l = getHolder().getLocation();
 		String name = getHolder().getName();
 		if (getPlayer() != null) {
-			getPlayer().sendMessage(ChatUtils.parseColor(String.format(Lang.pearlPearlIsHeld, name, l.getBlockX(), l.getBlockY(), l.getBlockZ(), l.getWorld().getName())));
+			getPlayer().sendMessage(ChatUtils.parseColor(String.format(Lang.pearlPearlIsHeld, name, l.getBlockX(), l.getBlockY(), l.getBlockZ(), l.getWorld().getName(), getHealthPercent())));
 		}
 		for(BroadcastListener b : bcastListeners) {
 			b.broadcast(this);