added laserjumps and cleaned up some code

2 files changed, 18 insertions, 21 deletions

diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index 60b1d0f9..c70e0850 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -780,36 +780,29 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
 		return false;
 	
 	/* zCatch */
-	bool Is_zCatch = GameServer()->m_pController->IsZCatch();
-	
-	if(From == m_pPlayer->GetCID())
+	if(GameServer()->m_pController->IsZCatch())
 	{
-		//No selfdamage
-		if(Is_zCatch)
-			Dmg = 0;
-		// m_pPlayer only inflicts half damage on self
-		else
+		if(From == m_pPlayer->GetCID() || Weapon == WEAPON_GAME)
+			return false;
+
+		if(g_Config.m_SvMode == 4 && Weapon == WEAPON_GRENADE && Dmg < g_Config.m_SvGrenadeMinDamage)
+			return false;
+
+		m_Health = 0;
+		m_Armor = 0;
+	}
+	else
+	{
+		if(From == m_pPlayer->GetCID())
 			Dmg = max(1, Dmg/2);
 	}
-
-	if(g_Config.m_SvMode == 4 && Weapon == WEAPON_GRENADE && Dmg < g_Config.m_SvGrenadeMinDamage)
-		Dmg = 0;
 	/* end zCatch */
 	
 	m_DamageTaken++;
 
 	if(Dmg)
 	{
-		/* zCatch*/
-		//One-Shot-One-Kill
-		if(Is_zCatch)
-		{
-			m_Health = 0;
-			m_Armor = 0;
-		}
-		/* end zCatch*/
-
-		else if(m_Armor)
+		if(m_Armor)
 		{
 			if(Dmg > 1)
 			{
diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp
index eb40c4e1..f45a1d1d 100644
--- a/src/game/server/entities/laser.cpp
+++ b/src/game/server/entities/laser.cpp
@@ -2,6 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <game/generated/protocol.h>
 #include <game/server/gamecontext.h>
+#include <engine/shared/config.h>
 #include "laser.h"
 
 CLaser::CLaser(CGameWorld *pGameWorld, vec2 Pos, vec2 Direction, float StartEnergy, int Owner)
@@ -67,6 +68,9 @@ void CLaser::DoBounce()
 				m_Energy = -1;
 
 			GameServer()->CreateSound(m_Pos, SOUND_RIFLE_BOUNCE);
+
+			if(m_Bounces == 1 && g_Config.m_SvLaserjumps && GameServer()->m_pController->IsZCatch())
+				GameServer()->CreateExplosion(m_Pos, m_Owner, WEAPON_GAME, false);
 		}
 	}
 	else