DP for Core L2J/L2J_Server@109b46e996a1c6d16dd033123a4b254d996ad050

dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java

@@ -18,8 +18,6 @@
  */
 package handlers.actionshifthandlers;
 
-import handlers.bypasshandlers.NpcViewMod;
-
 import java.util.Set;
 
 import com.l2jserver.Config;
@@ -36,6 +34,8 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.util.Util;
 
+import handlers.bypasshandlers.NpcViewMod;
+
 public class L2NpcActionShift implements IActionShiftHandler
 {
 	/**
@@ -43,15 +43,12 @@ public class L2NpcActionShift implements IActionShiftHandler
 	 * <BR>
 	 * <B><U> Actions (If the L2PcInstance is a GM only)</U> :</B><BR>
 	 * <BR>
-	 * <li>Set the L2NpcInstance as target of the L2PcInstance player (if necessary)</li> <li>Send a Server->Client packet MyTargetSelected to the L2PcInstance player (display the select window)</li> <li>If L2NpcInstance is autoAttackable, send a Server->Client packet StatusUpdate to the
-	 * L2PcInstance in order to update L2NpcInstance HP bar</li> <li>Send a Server->Client NpcHtmlMessage() containing the GM console about this L2NpcInstance</li><BR>
-	 * <BR>
-	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Each group of Server->Client packet must be terminated by a ActionFailed packet in order to avoid that client wait an other packet</B></FONT><BR>
-	 * <BR>
-	 * <B><U> Example of use </U> :</B><BR>
-	 * <BR>
-	 * <li>Client packet : Action</li><BR>
+	 * <li>Set the L2NpcInstance as target of the L2PcInstance player (if necessary)</li>
+	 * <li>Send a Server->Client packet MyTargetSelected to the L2PcInstance player (display the select window)</li>
+	 * <li>If L2NpcInstance is autoAttackable, send a Server->Client packet StatusUpdate to the L2PcInstance in order to update L2NpcInstance HP bar</li>
+	 * <li>Send a Server->Client NpcHtmlMessage() containing the GM console about this L2NpcInstance</li><BR>
 	 * <BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Each group of Server->Client packet must be terminated by a ActionFailed packet in order to avoid that client wait an other packet</B></FONT><BR> <BR> <B><U> Example of use </U> :</B><BR> <BR> <li>Client packet : Action</li><BR> <BR>
 	 */
 	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
@@ -78,10 +75,10 @@ public class L2NpcActionShift implements IActionShiftHandler
 			html.replace("%mp%", String.valueOf((int) ((L2Character) target).getCurrentMp()));
 			html.replace("%mpmax%", String.valueOf(((L2Character) target).getMaxMp()));
 			
-			html.replace("%patk%", String.valueOf(((L2Character) target).getPAtk(null)));
-			html.replace("%matk%", String.valueOf(((L2Character) target).getMAtk(null, null)));
-			html.replace("%pdef%", String.valueOf(((L2Character) target).getPDef(null)));
-			html.replace("%mdef%", String.valueOf(((L2Character) target).getMDef(null, null)));
+			html.replace("%patk%", String.valueOf((int) ((L2Character) target).getPAtk(null)));
+			html.replace("%matk%", String.valueOf((int) ((L2Character) target).getMAtk(null, null)));
+			html.replace("%pdef%", String.valueOf((int) ((L2Character) target).getPDef(null)));
+			html.replace("%mdef%", String.valueOf((int) ((L2Character) target).getMDef(null, null)));
 			html.replace("%accu%", String.valueOf(((L2Character) target).getAccuracy()));
 			html.replace("%evas%", String.valueOf(((L2Character) target).getEvasionRate(null)));
 			html.replace("%crit%", String.valueOf(((L2Character) target).getCriticalHit(null, null)));

dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java

@@ -73,7 +73,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		"admin_setfame", // sets fame of target char to any amount. //setfame <fame>
 		"admin_character_list", // same as character_info, kept for compatibility purposes
 		"admin_character_info", // given a player name, displays an information window
-		"admin_show_characters",// list of characters
+		"admin_show_characters", // list of characters
 		"admin_find_character", // find a player by his name or a part of it (case-insensitive)
 		"admin_find_ip", // find all the player connections from a given IPv4 number
 		"admin_find_account", // list all the characters from an account (useful for GMs w/o DB access)
@@ -908,7 +908,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		final PageResult result = HtmlUtil.createPage(players, page, 20, i ->
 		{
 			return "<td align=center><a action=\"bypass -h admin_show_characters " + i + "\">Page " + (i + 1) + "</a></td>";
-		}, player ->
+		} , player ->
 		{
 			StringBuilder sb = new StringBuilder();
 			sb.append("<tr>");
@@ -1009,10 +1009,10 @@ public class AdminEditChar implements IAdminCommandHandler
 		adminReply.replace("%currentload%", String.valueOf(player.getCurrentLoad()));
 		adminReply.replace("%maxload%", String.valueOf(player.getMaxLoad()));
 		adminReply.replace("%percent%", String.valueOf(Util.roundTo(((float) player.getCurrentLoad() / (float) player.getMaxLoad()) * 100, 2)));
-		adminReply.replace("%patk%", String.valueOf(player.getPAtk(null)));
-		adminReply.replace("%matk%", String.valueOf(player.getMAtk(null, null)));
-		adminReply.replace("%pdef%", String.valueOf(player.getPDef(null)));
-		adminReply.replace("%mdef%", String.valueOf(player.getMDef(null, null)));
+		adminReply.replace("%patk%", String.valueOf((int) player.getPAtk(null)));
+		adminReply.replace("%matk%", String.valueOf((int) player.getMAtk(null, null)));
+		adminReply.replace("%pdef%", String.valueOf((int) player.getPDef(null)));
+		adminReply.replace("%mdef%", String.valueOf((int) player.getMDef(null, null)));
 		adminReply.replace("%accuracy%", String.valueOf(player.getAccuracy()));
 		adminReply.replace("%evasion%", String.valueOf(player.getEvasionRate(null)));
 		adminReply.replace("%critical%", String.valueOf(player.getCriticalHit(null, null)));

dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java

@@ -187,11 +187,11 @@ public class NpcViewMod implements IBypassHandler
 		html.replace("%atktype%", Util.capitalizeFirst(npc.getAttackType().name().toLowerCase()));
 		html.replace("%atkrange%", npc.getStat().getPhysicalAttackRange());
 		
-		html.replace("%patk%", npc.getPAtk(activeChar));
-		html.replace("%pdef%", npc.getPDef(activeChar));
+		html.replace("%patk%", (int) npc.getPAtk(activeChar));
+		html.replace("%pdef%", (int) npc.getPDef(activeChar));
 		
-		html.replace("%matk%", npc.getMAtk(activeChar, null));
-		html.replace("%mdef%", npc.getMDef(activeChar, null));
+		html.replace("%matk%", (int) npc.getMAtk(activeChar, null));
+		html.replace("%mdef%", (int) npc.getMDef(activeChar, null));
 		
 		html.replace("%atkspd%", npc.getPAtkSpd());
 		html.replace("%castspd%", npc.getMAtkSpd());

dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -85,7 +85,7 @@ public final class EnergyAttack extends AbstractEffect
 		final Skill skill = info.getSkill();
 		
 		double attack = attacker.getPAtk(target);
-		int defence = target.getPDef(attacker);
+		double defence = target.getPDef(attacker);
 		
 		if (!_ignoreShieldDefence)
 		{