Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 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/powers/effectmodifiers/AbstractEffectModifier.java
+2 -2
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.objects.Building;
src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java
+2 -2
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.objects.*;
import java.sql.ResultSet;
src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java
+2 -2
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.objects.*;
import org.pmw.tinylog.Logger;
src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.powers.effectmodifiers;
import engine.Enum.ModType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.ModType;
import engine.objects.*;
import java.sql.ResultSet;
src/engine/powers/effectmodifiers/CannotCastEffectModifier.java
+2 -2
View File
@@ -9,8 +9,8 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums;
import engine.objects.*;
import java.sql.ResultSet;
@@ -31,7 +31,7 @@ public class CannotCastEffectModifier extends AbstractEffectModifier {
@Override
public void applyBonus(AbstractCharacter ac, int trains) {
if (ac.getObjectType().equals(Enum.GameObjectType.Mob)) {
if (ac.getObjectType().equals(mbEnums.GameObjectType.Mob)) {
Mob mob = (Mob) ac;
}
src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java
+2 -2
View File
@@ -9,8 +9,8 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums;
import engine.objects.*;
import engine.powers.DamageShield;
@@ -49,7 +49,7 @@ public class DamageShieldEffectModifier extends AbstractEffectModifier {
amount *= (1 + mod);
}
Enum.DamageType dt = Enum.DamageType.getDamageType(this.type);
mbEnums.DamageType dt = mbEnums.DamageType.getDamageType(this.type);
if (dt != null) {
src/engine/powers/effectmodifiers/HealthEffectModifier.java
+6 -6
View File
@@ -9,12 +9,12 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.Enum.GameObjectType;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.AbstractNetMsg;
import engine.net.DispatchMessage;
import engine.net.client.msg.ModifyHealthKillMsg;
@@ -28,13 +28,13 @@ import java.util.concurrent.ThreadLocalRandom;
public class HealthEffectModifier extends AbstractEffectModifier {
private Enum.DamageType damageType;
private mbEnums.DamageType damageType;
public HealthEffectModifier(ResultSet rs) throws SQLException {
super(rs);
String damageTypeDB = rs.getString("type");
try {
this.damageType = Enum.DamageType.getDamageType(damageTypeDB);
this.damageType = mbEnums.DamageType.getDamageType(damageTypeDB);
} catch (IllegalArgumentException e) {
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
src/engine/powers/effectmodifiers/InvisibleEffectModifier.java
+3 -3
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.gameManager.SessionManager;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums;
import engine.net.client.ClientConnection;
import engine.objects.*;
import engine.powers.ActionsBase;
@@ -30,7 +30,7 @@ public class InvisibleEffectModifier extends AbstractEffectModifier {
@Override
protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
if (awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (awo.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter pc = (PlayerCharacter) awo;
if (effect == null)
@@ -70,7 +70,7 @@ public class InvisibleEffectModifier extends AbstractEffectModifier {
bonus.updateIfHigher(this, (float) trains);
//remove pets
if (ac.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
if (ac.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter))
((PlayerCharacter) ac).dismissPet();
}
src/engine/powers/effectmodifiers/ManaEffectModifier.java
+7 -7
View File
@@ -9,11 +9,11 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.DispatchMessage;
import engine.net.client.msg.ModifyHealthMsg;
import engine.objects.*;
@@ -30,13 +30,13 @@ import java.util.concurrent.ThreadLocalRandom;
public class ManaEffectModifier extends AbstractEffectModifier {
private Enum.DamageType damageType;
private mbEnums.DamageType damageType;
public ManaEffectModifier(ResultSet rs) throws SQLException {
super(rs);
String damageTypeDB = rs.getString("type");
try {
this.damageType = Enum.DamageType.getDamageType(damageTypeDB);
this.damageType = mbEnums.DamageType.getDamageType(damageTypeDB);
} catch (IllegalArgumentException e) {
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
@@ -89,7 +89,7 @@ public class ManaEffectModifier extends AbstractEffectModifier {
max *= (1 + mod);
}
}
if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter pc = (PlayerCharacter) source;
float focus;
@@ -176,7 +176,7 @@ public class ManaEffectModifier extends AbstractEffectModifier {
if (AbstractWorldObject.IsAbstractCharacter(awo)) {
AbstractCharacter ac = (AbstractCharacter) awo;
resists = ac.getResists();
} else if (awo.getObjectType().equals(Enum.GameObjectType.Building))
} else if (awo.getObjectType().equals(mbEnums.GameObjectType.Building))
resists = ((Building) awo).getResists();
// calculate resists in if any
src/engine/powers/effectmodifiers/NoModEffectModifier.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.powers.effectmodifiers;
import engine.Enum.GameObjectType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.GameObjectType;
import engine.objects.*;
import java.sql.ResultSet;
src/engine/powers/effectmodifiers/StaminaEffectModifier.java
+7 -7
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.net.DispatchMessage;
@@ -30,13 +30,13 @@ import java.util.concurrent.ThreadLocalRandom;
public class StaminaEffectModifier extends AbstractEffectModifier {
private Enum.DamageType damageType;
private mbEnums.DamageType damageType;
public StaminaEffectModifier(ResultSet rs) throws SQLException {
super(rs);
String damageTypeDB = rs.getString("type");
try {
this.damageType = Enum.DamageType.getDamageType(damageTypeDB);
this.damageType = mbEnums.DamageType.getDamageType(damageTypeDB);
} catch (IllegalArgumentException e) {
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
@@ -87,7 +87,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
max *= (1 + mod);
}
}
if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter pc = (PlayerCharacter) source;
float focus;
@@ -176,7 +176,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
if (AbstractWorldObject.IsAbstractCharacter(awo)) {
AbstractCharacter ac = (AbstractCharacter) awo;
resists = ac.getResists();
} else if (awo.getObjectType().equals(Enum.GameObjectType.Building))
} else if (awo.getObjectType().equals(mbEnums.GameObjectType.Building))
resists = ((Building) awo).getResists();
// calculate resists in if any
src/engine/powers/effectmodifiers/StunnedEffectModifier.java
+1 -1
View File
@@ -9,7 +9,7 @@
package engine.powers.effectmodifiers;
import engine.Enum.GameObjectType;
import engine.mbEnums.GameObjectType;
import engine.jobs.AbstractEffectJob;
import engine.objects.*;