Merge remote-tracking branch 'upstream/master' into master

This commit is contained in:
ThatGamerBlue
2021-04-07 20:25:02 +01:00
18 changed files with 166 additions and 98 deletions

View File

@@ -384,7 +384,7 @@ public class PlayerManager
}
else if (itemComposition.isTradeable())
{
prices.put(id, itemManager.getItemPrice(id, false));
prices.put(id, itemManager.getItemPrice(id));
}
}