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

xp and range fix

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-05-22 06:43:51 -05:00
parent a660457883
commit 1d703b08a2
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+1 -1
View File
@@ -1278,7 +1278,7 @@ public enum CombatManager {
if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
range += ((PlayerCharacter)ac).getCharacterHeight() * 0.5f;
if(ac.isMoving()){
range += ac.getSpeed();
range += ((PlayerCharacter) ac).getCharacterHeight();
}
}
src/engine/objects/Experience.java
+13 -10
View File
@@ -11,6 +11,7 @@ package engine.objects;
import engine.Enum;
import engine.Enum.TargetColor;
import engine.gameManager.LootManager;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
import engine.server.MBServerStatics;
@@ -443,13 +444,14 @@ public class Experience {
if (grantedExperience == 0)
grantedExperience = 1;
grantedExperience *= LootManager.NORMAL_EXP_RATE;
// Grant the player the EXP
if(mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
playerCharacter.grantXP((int) Math.floor(grantedExperience), true);
else
playerCharacter.grantXP((int) Math.floor(grantedExperience),false);
if(mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (((PlayerCharacter) mob).pvpDeaths.contains(killer.getObjectUUID()) == false)
playerCharacter.grantXP((int) Math.floor(grantedExperience), true);
}else {
playerCharacter.grantXP((int) Math.floor(grantedExperience), false);
}
}
} else { // Give EXP to a single character
@@ -474,11 +476,12 @@ public class Experience {
grantedExperience *= .6;
// Grant XP
if(mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
if(((PlayerCharacter)mob).pvpDeaths.contains(killer.getObjectUUID()) == false)
if(mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (((PlayerCharacter) mob).pvpDeaths.contains(killer.getObjectUUID()) == false)
killer.grantXP((int) Math.floor(grantedExperience), true);
else
killer.grantXP((int) Math.floor(grantedExperience),false);
}else {
killer.grantXP((int) Math.floor(grantedExperience), false);
}
}
}
}