From 23cfe66ecb2a7c4e092a0339192bc6371592d236 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Tue, 21 Feb 2023 12:55:04 -0600 Subject: [PATCH] IDBCPlayer: -Made getMeleeStrength an overriding function to IEntityLivingBase --- .../noppes/npcs/scripted/entity/ScriptDBCPlayer.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java index 71676fc0a..9a3d8928b 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java @@ -628,7 +628,7 @@ public class ScriptDBCPlayer extends ScriptPlayer i return ""; } - public double getMaxMeleeDamage() { + public double getMaxMeleeStrength() { EntityPlayer player = this.getMCEntity(); try { @@ -668,19 +668,17 @@ public class ScriptDBCPlayer extends ScriptPlayer i STR = (int) getPlayerAttribute.invoke(null,player, plyrAttrbts, 0, state, state2, race, sklx, (int)release, resrv, lg, mj, kk, mc, mn, gd, powerType, PlyrSkills, c, absorption); return (int) stat.invoke(null,player, 0, powerType, 0, STR, race, classID, 0.0F); } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { - return 0.0F; + return super.getMeleeStrength(); } } - public double getMeleeDamage() { - EntityPlayer player = this.getMCEntity(); - + public double getMeleeStrength() { try { Class JRMCoreH = Class.forName("JinRyuu.JRMCore.JRMCoreH"); Method weightPerc = JRMCoreH.getDeclaredMethod("weightPerc",int.class,EntityPlayer.class); - return this.getMaxMeleeDamage() * this.getRelease() * 0.01D * (float) weightPerc.invoke(null,0, player); + return this.getMaxMeleeStrength() * this.getRelease() * 0.01D * (float) weightPerc.invoke(null,0, this.getMCEntity()); } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { - return 0.0F; + return super.getMeleeStrength(); } } } \ No newline at end of file