fix visual duplication & null issue

auxves · Jan 7, 2021 · cbbc2de · cbbc2de
1 parent b7eb5e6
commit cbbc2de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/kotlin/io/glossnyx/vibes/network/ClientNetworking.kt b/src/main/kotlin/io/glossnyx/vibes/network/ClientNetworking.kt
@@ -52,8 +52,8 @@ object ClientNetworking {
 			}
 
 			Items.AIR -> {
-				if (player.isCreative) slot.stack = discOf(cursorStack)
-
+				val disc = discOf(cursorStack) ?: return
+				if (player.isCreative) slot.stack = disc
 				setDiscOf(cursorStack, ItemStack.EMPTY)
 
 				send(RightClickStop(slot.id))

diff --git a/src/main/kotlin/io/glossnyx/vibes/network/ServerNetworking.kt b/src/main/kotlin/io/glossnyx/vibes/network/ServerNetworking.kt
@@ -130,12 +130,13 @@ object ServerNetworking {
 			val cursorStack = player.inventory.cursorStack
 
 			val uuid = uuidOf(cursorStack) ?: return@register
+			val disc = discOf(cursorStack) ?: return@register
 
 			if (player.isCreative) {
-				slot.stack = discOf(cursorStack)
+				slot.stack = disc
 				setDiscOf(cursorStack, ItemStack.EMPTY)
 			} else {
-				player.inventory.cursorStack = discOf(cursorStack)
+				player.inventory.cursorStack = disc
 				slot.stack = cursorStack.copy()
 				setDiscOf(slot.stack, ItemStack.EMPTY)
 			}