From cbe33c21ec62a29d3ec6ae363dcf7cfb6a9c40a9 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Mon, 15 Aug 2016 19:12:28 -0700
Subject: [PATCH] checking for a death cool down on the player and whether or
not the npc is still alive before we go and try and get all angry
---
src/main/java/com/comandante/creeper/player/Player.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index 6d29a8bb..0b970850 100644
--- a/src/main/java/com/comandante/creeper/player/Player.java
+++ b/src/main/java/com/comandante/creeper/player/Player.java
@@ -590,6 +590,12 @@ public class Player extends CreeperEntity {
if (!getCurrentRoom().getRoomId().equals(originalRoom.getRoomId())) {
return;
}
+ if (!npc.getIsAlive().get()) {
+ return;
+ }
+ if (isActive(CoolDownType.DEATH)) {
+ return;
+ }
gameManager.writeToPlayerCurrentRoom(getPlayerId(), getPlayerName() + " has " + Color.BOLD_ON + Color.RED + "ANGERED" + Color.RESET + " a " + npc.getColorName() + "\r\n");
addActiveFight(npc);
}, 5, TimeUnit.SECONDS);
--
GitLab