Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
pull from: 2009Scape:master
merge into: Snowscape:upstream
Conversation 0 Commits 204 Files changed 719 +4 -3
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b39b75e959 - Show all commits

7
Server/src/main/core/game/shops/Shop.kt
View file

@ -62,17 +62,18 @@ class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean =
fun showTab(player: Player, main: Boolean) fun showTab(player: Player, main: Boolean)
{ {
val cont = if (main) getAttribute<Container?>(player, "shop-cont", null) ?: return else playerStock val mainCont = getAttribute<Container?>(player, "shop-cont", null) ?: return
val cont = if (main) mainCont else playerStock
if(!main) if(!main)
{ {
cont.listeners.remove(listenerInstances[player.details.uid]) mainCont.listeners.remove(listenerInstances[player.details.uid])
playerStock.listeners.add(listenerInstances[player.details.uid]) playerStock.listeners.add(listenerInstances[player.details.uid])
} }
else else
{ {
playerStock.listeners.remove(listenerInstances[player.details.uid]) playerStock.listeners.remove(listenerInstances[player.details.uid])
cont.listeners.add(listenerInstances[player.details.uid]) mainCont.listeners.add(listenerInstances[player.details.uid])
} }
val settings = IfaceSettingsBuilder() val settings = IfaceSettingsBuilder()