Merge branch 'master' into dev

This commit is contained in:
Maruno17
2021-08-03 18:48:11 +01:00
5 changed files with 19 additions and 14 deletions

View File

@@ -1126,7 +1126,7 @@ BattleHandlers::TargetItemOnHit.add(:STICKYBARB,
target.item = nil
target.effects[PBEffects::Unburden] = true
if battle.wildBattle? && !user.opposes?
if !user.initialItem && target.initialItem==user.item
if !user.initialItem && user.item == target.initialItem
user.setInitialItem(user.item)
target.setInitialItem(nil)
end