Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 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)){ if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
range += ((PlayerCharacter)ac).getCharacterHeight() * 0.5f; range += ((PlayerCharacter)ac).getCharacterHeight() * 0.5f;
if(ac.isMoving()){ 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;
import engine.Enum.TargetColor; import engine.Enum.TargetColor;
import engine.gameManager.LootManager;
import engine.gameManager.ZoneManager; import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
@@ -443,13 +444,14 @@ public class Experience {
if (grantedExperience == 0) if (grantedExperience == 0)
grantedExperience = 1; grantedExperience = 1;
grantedExperience *= LootManager.NORMAL_EXP_RATE;
// Grant the player the EXP // Grant the player the EXP
if(mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) if(mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
playerCharacter.grantXP((int) Math.floor(grantedExperience), true); if (((PlayerCharacter) mob).pvpDeaths.contains(killer.getObjectUUID()) == false)
else playerCharacter.grantXP((int) Math.floor(grantedExperience), true);
playerCharacter.grantXP((int) Math.floor(grantedExperience),false); }else {
playerCharacter.grantXP((int) Math.floor(grantedExperience), false);
}
} }
} else { // Give EXP to a single character } else { // Give EXP to a single character
@@ -474,11 +476,12 @@ public class Experience {
grantedExperience *= .6; grantedExperience *= .6;
// Grant XP // Grant XP
if(mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) if(mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if(((PlayerCharacter)mob).pvpDeaths.contains(killer.getObjectUUID()) == false) if (((PlayerCharacter) mob).pvpDeaths.contains(killer.getObjectUUID()) == false)
killer.grantXP((int) Math.floor(grantedExperience), true); killer.grantXP((int) Math.floor(grantedExperience), true);
else }else {
killer.grantXP((int) Math.floor(grantedExperience),false); killer.grantXP((int) Math.floor(grantedExperience), false);
}
} }
} }
} }