Skip to content

Commit 475e3a0

Browse files
committed
Fix #2
1 parent 5225433 commit 475e3a0

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/main/java/rpggods/client/screen/FavorScreen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public FavorScreen(FavorContainer screenContainer, PlayerInventory inv, ITextCom
197197
for(DeityHelper deityHelper : RPGGods.DEITY_HELPER.values()) {
198198
// skip deities that are not enabled or not unlocked
199199
Deity d = deityHelper.getDeity().orElse(Deity.EMPTY);
200-
if(!d.isEnabled() || !favor.getFavor(deityHelper.id).isEnabled()) {
200+
if(!d.isEnabled() || !favor.getFavor(d.getId()).isEnabled()) {
201201
continue;
202202
}
203203
// add deity to list
@@ -278,7 +278,7 @@ public FavorScreen(FavorContainer screenContainer, PlayerInventory inv, ITextCom
278278
deity = screenContainer.getDeity().orElse(deityList.get(0));
279279
// ensure deity is unlocked
280280
Deity d = RPGGods.DEITY.get(deity).orElse(Deity.EMPTY);
281-
if(!d.isUnlocked() || !d.isEnabled()) {
281+
if(!favor.getFavor(deity).isEnabled()) {
282282
deity = deityList.get(0);
283283
}
284284
}

src/main/java/rpggods/perk/PerkAction.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,9 @@ public boolean run(final ResourceLocation deity, final PlayerEntity player, fina
254254
// add or remove durability
255255
if(!item.isEmpty() && item.isDamageableItem()) {
256256
float multiplier = Math.max(-1.0F, Math.min(1.0F, getMultiplier().get()));
257-
int durability = Math.round(multiplier * item.getMaxDamage());
258-
item.setDamageValue(item.getDamageValue() + durability);
257+
int delta = Math.round(multiplier * item.getMaxDamage());
258+
int damage = Math.max(0, item.getDamageValue() - delta);
259+
item.setDamageValue(damage);
259260
return true;
260261
}
261262
}

0 commit comments

Comments
 (0)