Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Merge Damage and Source types.

Browse Source
This commit is contained in:
MagicBot
2024-02-26 03:44:51 -05:00
parent a7b3fba018
commit e8e84e00af
16 changed files with 177 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/powers/poweractions/TransferStatPowerAction.java
+2 -3
View File
@@ -10,7 +10,6 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.Enum.DamageType;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.gameManager.ChatManager;
@@ -46,7 +45,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
protected float transferEfficiencyRamp;
protected boolean transferEfficiencyRampAdd;
protected boolean targetToCaster;
protected DamageType damageType;
protected SourceType damageType;
protected EffectsBase effect;
public TransferStatPowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
@@ -80,7 +79,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
// Damage type can sometimes be null in the DB.
if (damageString.isEmpty() == false)
this.damageType = DamageType.valueOf(damageString);
this.damageType = SourceType.valueOf(damageString);
} catch (Exception e) {
this.damageType = null;
}