From 849bf8bca7d8df41bc6adca236fef8ba2886d1ff Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 21 Feb 2016 00:42:32 +0300
Subject: Remove useless checks.

---
 src/net/eathena/beingrecv.cpp | 3 +--
 src/net/eathena/loginrecv.cpp | 2 +-
 src/particle/particle.cpp     | 2 +-
 src/utils/chatutils.cpp       | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index c744fae34..5ab7bf5e3 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -1424,8 +1424,7 @@ void BeingRecv::processBeingAttrs(Net::MessageIn &msg)
         {
             if (dstBeing == localPlayer)
                 localPlayer->setGMLevel(0);
-            if (dstBeing)
-                dstBeing->setGM(false);
+            dstBeing->setGM(false);
         }
         if (haveMount)
         {
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
index 840869703..220257ba6 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.cpp
@@ -132,7 +132,7 @@ void LoginRecv::processUpdateHost2(Net::MessageIn &msg)
         {
             logger->log1("Warning: incorrect update server name");
             loginData.updateHosts.clear();
-        break;
+            break;
         }
     }
 
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index 97c2c42d6..ac9ba8394 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -338,7 +338,7 @@ Particle *Particle::addEffect(const std::string &restrict particleEffectFile,
         else if ((node = XML::findFirstChildByName(effectChildNode, "image")))
         {
             std::string imageSrc;
-            if (node && XmlHaveChildContent(node))
+            if (XmlHaveChildContent(node))
                 imageSrc = XmlChildContent(node);
             if (!imageSrc.empty() && !dyePalettes.empty())
                 Dye::instantiate(imageSrc, dyePalettes);
diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp
index 0d2c5cdd9..eab50ee1c 100644
--- a/src/utils/chatutils.cpp
+++ b/src/utils/chatutils.cpp
@@ -159,8 +159,7 @@ void replaceVars(std::string &str)
         std::string newStr;
         const Party *party = nullptr;
         if (localPlayer->isInParty() &&
-            (party = localPlayer->getParty()) &&
-            party)
+            (party = localPlayer->getParty()))
         {
             party->getNames(names);
             FOR_EACH (StringVectCIter, it, names)
-- 
cgit v1.2.3-60-g2f50