damage hotfix

The-Evil-Pickle · Sep 9, 2018 · 4918410 · 4918410
1 parent 47f86c6
commit 4918410
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -89,5 +89,5 @@
     </plugins>
 	<finalName>${project.artifactId}</finalName>
   </build>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
 </project>
diff --git a/src/main/java/com/megacrit/cardcrawl/cards/colorless/Trickstab.java b/src/main/java/com/megacrit/cardcrawl/cards/colorless/Trickstab.java
@@ -62,6 +62,9 @@ public void applyPowers() {
       this.block = MathUtils.floor(tmp);
       this.baseDamage = this.block;
       super.applyPowers();
+      if (this.isBlockModified) {
+    	  this.isDamageModified = true;
+      }
   }
   @Override
   public void calculateCardDamage(final AbstractMonster mo) {

diff --git a/src/main/java/replayTheSpire/patches/PlayerDamagePatch.java b/src/main/java/replayTheSpire/patches/PlayerDamagePatch.java
@@ -46,7 +46,7 @@ public static void Prefix(AbstractPlayer player, DamageInfo info) {
 		}
 	}
 	public static void Postfix(AbstractPlayer player, DamageInfo info) {
-		if (player != null && info.type != DamageInfo.DamageType.NORMAL && ((info.owner != AbstractDungeon.player && info.owner.hasPower("Specialist")) || ReplayTheSpireMod.BypassStupidBasemodRelicRenaming_hasRelic(DimensionalGlitch.ID))) {
+		if (player != null && info.type != DamageInfo.DamageType.NORMAL && ((info.owner != null && info.owner != AbstractDungeon.player && info.owner.hasPower("Specialist")) || ReplayTheSpireMod.BypassStupidBasemodRelicRenaming_hasRelic(DimensionalGlitch.ID))) {
 			info.output = PlayerDamagePatch.initialDamage;
 		}
 	}

diff --git a/src/main/resources/ModTheSpire.json b/src/main/resources/ModTheSpire.json
@@ -4,7 +4,7 @@
   "author_list": ["The_Evil_Pickle", "AstroPenguin642", "Stewartisme", "Slimer509", "Bakuhaku"],
   "description": "Huge content expansion mod. Adds new cards, relics, potions, events, monsters, and shenanigans.",
   "dependencies": ["basemod"],
-  "version": "1.1.2",
+  "version": "1.1.3",
   "sts_version": "09-06-2018",
   "mts_version": "3.0.0",
   "update_json": "https://api.github.com/repos/AstroPenguin642/Replay-the-Spire/releases/latest"