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

Renamed class to not conflict with the java.lang version.

Browse Source
This commit is contained in:
MagicBot
2024-04-05 07:59:44 -04:00
parent dd84615ca1
commit c1ee6f5b52
388 changed files with 1807 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/CharacterSkill.java
+7 -7
View File
@@ -9,10 +9,10 @@
package engine.objects;
import engine.Enum;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.ByteBufferWriter;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
@@ -260,7 +260,7 @@ public class CharacterSkill extends AbstractGameObject {
this.numTrains.set(trains);
this.ownerUID = mob.getObjectUUID();
this.isMobOwner = true;
boolean isGuard = mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN) || mob.agentType.equals(Enum.AIAgentType.GUARDMINION);
boolean isGuard = mob.agentType.equals(mbEnums.AIAgentType.GUARDCAPTAIN) || mob.agentType.equals(mbEnums.AIAgentType.GUARDMINION);
calculateMobBaseAmount(isGuard);
calculateModifiedAmount(isGuard);
@@ -388,8 +388,8 @@ public class CharacterSkill extends AbstractGameObject {
int available = 0;
//get racial bonus;
if (pc.race.getRaceType().equals(Enum.RaceType.HUMANMALE) ||
pc.race.getRaceType().equals(Enum.RaceType.HUMANFEMALE))
if (pc.race.getRaceType().equals(mbEnums.RaceType.HUMANMALE) ||
pc.race.getRaceType().equals(mbEnums.RaceType.HUMANFEMALE))
raceBonus = 1; //Human racial bonus;
//get base class trains
@@ -481,7 +481,7 @@ public class CharacterSkill extends AbstractGameObject {
* Don't Call this directly. Instead call pc.calculateSkills().
*/
public static void calculateSkills(AbstractCharacter absChar) {
if (absChar == null && absChar.getObjectType().equals(Enum.GameObjectType.PlayerCharacter) == false)
if (absChar == null && absChar.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter) == false)
return;
PlayerCharacter pc = (PlayerCharacter) absChar;