From 4cfee250307281c2d35a8fcbc90493beb46bcbc6 Mon Sep 17 00:00:00 2001
From: Mads Boddum <danish_cyborg@hotmail.com>
Date: Tue, 11 Oct 2016 02:02:03 +0200
Subject: [PATCH] You no longer gain XP by killing players

---
 src/services/combat/CombatXpService.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/services/combat/CombatXpService.java b/src/services/combat/CombatXpService.java
index 9d9461892..957c7cc5a 100644
--- a/src/services/combat/CombatXpService.java
+++ b/src/services/combat/CombatXpService.java
@@ -124,6 +124,13 @@ public class CombatXpService extends Service {
 	}
 	
 	private void handleCreatureKilledIntent(CreatureKilledIntent i) {
+		CreatureObject corpse = i.getCorpse();
+		
+		// You don't gain XP by PvP'ing
+		if(corpse.isPlayer()) {
+			return;
+		}
+		
 		CreatureObject killer = i.getKiller();
 		GroupObject group = groupObjects.get(killer.getGroupId());
 		
@@ -132,8 +139,6 @@ public class CombatXpService extends Service {
 			return;
 		}
 		
-		CreatureObject corpse = i.getCorpse();
-		
 		short killerLevel = group != null ? group.getLevel() : killer.getLevel();
 		short corpseLevel = corpse.getLevel();
 		int experienceGained;