MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

fixed pet attack and null weapon combat issue

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-05-26 22:00:52 -05:00
parent 7ed026f088
commit 22c8cdcf65
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+3 -4
View File
@@ -225,7 +225,8 @@ public enum CombatManager {
} }
} }
// take stamina away from attacker
if (weapon != null) {
//check if Out of Stamina //check if Out of Stamina
if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) { if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
if (attacker.getStamina() < (weapon.template.item_wt / 3f)) { if (attacker.getStamina() < (weapon.template.item_wt / 3f)) {
@@ -234,13 +235,11 @@ public enum CombatManager {
return; return;
} }
} }
// take stamina away from attacker
if (weapon != null) {
float stam = weapon.template.item_wt / 3f; float stam = weapon.template.item_wt / 3f;
stam = (stam < 1) ? 1 : stam; stam = (stam < 1) ? 1 : stam;
attacker.modifyStamina(-(stam), attacker, true); attacker.modifyStamina(-(stam), attacker, true);
} else } else
attacker.modifyStamina(-0.5f, attacker, true); attacker.modifyStamina(1, attacker, true);
//cancel things that are cancelled by an attack //cancel things that are cancelled by an attack
src/engine/net/client/handlers/PetAttackMsgHandler.java
-3
View File
@@ -46,9 +46,6 @@ public class PetAttackMsgHandler extends AbstractClientMsgHandler {
if (!pet.isAlive()) if (!pet.isAlive())
return true; return true;
if (pet.getCombatTarget() == null)
return true;
if ((playerCharacter.inSafeZone()) if ((playerCharacter.inSafeZone())
&& (msg.getTargetType() == mbEnums.GameObjectType.PlayerCharacter.ordinal())) && (msg.getTargetType() == mbEnums.GameObjectType.PlayerCharacter.ordinal()))
return true; return true;