Open CombatAssistant.java

Add these methods
[code]
		public void appendHit(Client c2, int damage, int mask, int icon, int damageMask, boolean maxHit) {
		c2.hitMask = mask;
		c2.hitIcon = icon;
		c2.updateRequired = true;
		c2.handleHitMask(damage, mask, icon);
		c2.dealDamage(damage);
		c2.getPA().refreshSkill(3);
	}

	public void appendHit(NPC n, int damage, int mask, int icon, int damageMask, boolean maxHit) {
		n.HP -= damage;
		switch(damageMask) {
			case 1:
			n.hitDiff = damage;
			n.hitUpdateRequired = true;
			n.updateRequired = true;
			n.hitMask = mask;
			n.hitIcon = icon;
			break;

			case 2:
			n.hitDiff2 = damage;
			n.hitUpdateRequired2 = true;
			n.updateRequired = true;
			c.doubleHit = false;
			n.hitMask2 = mask;
			n.hitIcon2 = icon;
			break;
		}
	}[/code]

Now to make the hitmarks show for Npcs
Search [code]
				if(dropArrows) {
					c.getItems().dropArrowNpc();
				}
[/code]

Right under there add
[code]
			Server.npcHandler.npcs[i].hitMask = 0;
			Server.npcHandler.npcs[i].hitIcon = 1;
[/code]

Right under there you should see [code]
				if (damage2 > -1) {
					Server.npcHandler.npcs[i].hitDiff2 = damage2;
					Server.npcHandler.npcs[i].HP -= damage2;
					c.totalDamageDealt += damage2;
				}
[/code]

Replace it with [code]
				if (damage2 > -1) {
					Server.npcHandler.npcs[i].hitDiff2 = damage2;
					Server.npcHandler.npcs[i].HP -= damage2;
					c.totalDamageDealt += damage2;
			Server.npcHandler.npcs[i].hitMask2 = 0;
			Server.npcHandler.npcs[i].hitIcon2 = 1;
				}
[/code]

Now search for
[code]
				if(c.MAGIC_SPELLS[c.oldSpellId][6] != 0) {
					Server.npcHandler.npcs[i].hitDiff = damage;
					Server.npcHandler.npcs[i].HP -= damage;
					Server.npcHandler.npcs[i].hitUpdateRequired = true;
					c.totalDamageDealt += damage;
				}
[/code]

Replace it with:

[code]
				if(c.MAGIC_SPELLS[c.oldSpellId][6] != 0) {
					Server.npcHandler.npcs[i].hitDiff = damage;
					Server.npcHandler.npcs[i].HP -= damage;
			Server.npcHandler.npcs[i].hitMask = 0;
			Server.npcHandler.npcs[i].hitIcon = 2;
					Server.npcHandler.npcs[i].hitUpdateRequired = true;
					c.totalDamageDealt += damage;
				}
[/code]

Now search for applyNpcMeleeDamage method at the bottom you should see

[code]
			case 1:
			Server.npcHandler.npcs[i].hitDiff = damage;
			Server.npcHandler.npcs[i].HP -= damage;
			c.totalDamageDealt += damage;
			Server.npcHandler.npcs[i].hitUpdateRequired = true;
			Server.npcHandler.npcs[i].updateRequired = true;
			break;

			case 2:
			Server.npcHandler.npcs[i].hitDiff2 = damage;
			Server.npcHandler.npcs[i].HP -= damage;
			c.totalDamageDealt += damage;
			Server.npcHandler.npcs[i].hitUpdateRequired2 = true;
			Server.npcHandler.npcs[i].updateRequired = true;
			c.doubleHit = false;
			break;
[/code]

Replace with

[code]
			case 1:
			Server.npcHandler.npcs[i].hitDiff = damage;
			Server.npcHandler.npcs[i].HP -= damage;
			c.totalDamageDealt += damage;
			Server.npcHandler.npcs[i].hitMask = 0;
			Server.npcHandler.npcs[i].hitIcon = 0;
			Server.npcHandler.npcs[i].hitUpdateRequired = true;
			Server.npcHandler.npcs[i].updateRequired = true;
			break;

			case 2:
			Server.npcHandler.npcs[i].hitDiff2 = damage;
			Server.npcHandler.npcs[i].HP -= damage;
			c.totalDamageDealt += damage;
			Server.npcHandler.npcs[i].hitUpdateRequired2 = true;
			Server.npcHandler.npcs[i].updateRequired = true;
			c.doubleHit = false;
			break;

[/code]

Npcs are done, now for players

Search
 [code]
				if(dropArrows) {
					c.getItems().dropArrowPlayer();
				}
				Server.playerHandler.players[i].underAttackBy = c.playerId;
				Server.playerHandler.players[i].logoutDelay = System.currentTimeMillis();
				Server.playerHandler.players[i].singleCombatDelay = System.currentTimeMillis();
				Server.playerHandler.players[i].killerId = c.playerId;
				Server.playerHandler.players[i].dealDamage(damage);
				Server.playerHandler.players[i].damageTaken[c.playerId] += damage;
				c.killedBy = Server.playerHandler.players[i].playerId;
				Server.playerHandler.players[i].handleHitMask(damage);
				if (damage2 != -1) {
					Server.playerHandler.players[i].dealDamage(damage2);
					Server.playerHandler.players[i].damageTaken[c.playerId] += damage2;
					Server.playerHandler.players[i].handleHitMask(damage2);

				}
[/code]

Replace it with

[code]
				if(dropArrows) {
					c.getItems().dropArrowPlayer();
				}
				Server.playerHandler.players[i].underAttackBy = c.playerId;
				Server.playerHandler.players[i].logoutDelay = System.currentTimeMillis();
				Server.playerHandler.players[i].singleCombatDelay = System.currentTimeMillis();
				Server.playerHandler.players[i].killerId = c.playerId;
				Server.playerHandler.players[i].dealDamage(damage);
				Server.playerHandler.players[i].damageTaken[c.playerId] += damage;
				c.killedBy = Server.playerHandler.players[i].playerId;
				Server.playerHandler.players[i].handleHitMask(damage, 0, 1);
				if (damage2 != -1) {
					//Server.playerHandler.players[i].playerLevel[3] -= damage2;
					Server.playerHandler.players[i].dealDamage(damage2);
					Server.playerHandler.players[i].damageTaken[c.playerId] += damage2;
					Server.playerHandler.players[i].handleHitMask(damage, 0, 1);

				}
[/code]

Now search for:

[code]
				if(c.MAGIC_SPELLS[c.oldSpellId][6] != 0) {
					//Server.playerHandler.players[i].playerLevel[3] -= damage;
					Server.playerHandler.players[i].dealDamage(damage);
					Server.playerHandler.players[i].damageTaken[c.playerId] += damage;
					c.totalPlayerDamageDealt += damage;
					if (!c.magicFailed) {
						//Server.playerHandler.players[i].setHitDiff(damage);
						//Server.playerHandler.players[i].setHitUpdateRequired(true);
						Server.playerHandler.players[i].handleHitMask(damage);
					}
				}
[/code]

Replace it with

[code]
				if(c.MAGIC_SPELLS[c.oldSpellId][6] != 0) {
					//Server.playerHandler.players[i].playerLevel[3] -= damage;
					Server.playerHandler.players[i].dealDamage(damage);
					Server.playerHandler.players[i].damageTaken[c.playerId] += damage;
					c.totalPlayerDamageDealt += damage;
					if (!c.magicFailed) {
						//Server.playerHandler.players[i].setHitDiff(damage);
						//Server.playerHandler.players[i].setHitUpdateRequired(true);
						Server.playerHandler.players[i].handleHitMask(damage, 0, 2);
					}
				}
[/code]

Finally search for

[code]
public void applyPlayerMeleeDamage(int i, int damageMask){
[/code]

At the very end of the void, before the last bracket add

[code]
Server.playerHandler.players[i].handleHitMask(damage, 0, 0);
[/code]