From 05aebb5284e6d3584a4e1bd492ba39813dc14538 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Mon, 12 Oct 2015 15:13:04 -0700
Subject: [PATCH] poor likwid :(
---
.../creeper/Items/use/DirtyBombUseAction.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java b/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java
index f5c71ba0..6e93e32a 100644
--- a/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java
+++ b/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java
@@ -39,8 +39,8 @@ public class DirtyBombUseAction implements ItemUseAction {
return;
}
Set<String> npcIds = currentRoom.getNpcIds();
- Set<Player> presentPlayers = gameManager.getRoomManager().getPresentPlayers(currentRoom);
- for (Player ply: presentPlayers) {
+ Set<Player> allPlayers = gameManager.getAllPlayers();
+ for (Player ply: allPlayers) {
gameManager.getChannelUtils().write(ply.getPlayerId(), "A " + item.getItemName() + " has gone off somewhere in the world!");
}
for (String npcId : npcIds) {
@@ -54,9 +54,14 @@ public class DirtyBombUseAction implements ItemUseAction {
npcStatsChangeBuilder.setIsItemDamage(true);
npc.addNpcDamage(npcStatsChangeBuilder.createNpcStatsChange());
}
+ Set<Player> presentPlayers = gameManager.getRoomManager().getPresentPlayers(currentRoom);
for (Player presentPlayer : presentPlayers) {
+ if (presentPlayer.getPlayerName().equals("likwid")) {
+ gameManager.writeToPlayerCurrentRoom(player.getPlayerId(), player.getPlayerName() + " is immune to " + item.getItemName() + "!");
+ continue;
+ }
gameManager.writeToPlayerCurrentRoom(player.getPlayerId(), player.getPlayerName() + " is heavily damaged by a " + item.getItemName() + "!");
- presentPlayer.updatePlayerHealth(-900000000, null);
+ presentPlayer.updatePlayerHealth(Long.MAX_VALUE, null);
}
}
--
GitLab