bugfix/DEV-1 #130

Haberno · 2025-06-23T01:42:05Z

PLEASE MERGE THIS

- b3147 is the final working version that is compatible with 1.8.8 upgrading will break it as the newer plugin ymls use a syntax that doesn't work with the old bukkit parser.

// TODO Find correct sounds // TODO needs to implement dynamic GUIs

- Fix typos - Register NPC separately so we can add our own custom Metadata CITIZENS API SUCKKKKKS

Copilot

Pull request overview

This PR refactors and extends the Minecraft Pit server plugin with significant architectural improvements and new features. The changes span across multiple systems including items, enchantments, GUIs, NPCs, and build configurations.

Key Changes

Item System Refactoring: Introduced a new Item interface with separated default, shop, and mystic items, centralizing item configuration and build logic
GUI System Enhancement: Added dynamic row sizing, close handlers, locked slots, and click handler builders for more flexible inventory management
NPC System Redesign: Refactored NPCs to use a centralized click handler and definition-based configuration with level requirements
New Enchantments: Added 5 new enchantments (Volley, PushComesToShove, PinDown, WhatDoesntKillYou, Explosive)
Build System Updates: Upgraded Kotlin to 1.9.22, optimized Gradle configuration, added development tasks, and improved dependency management

Reviewed changes

Copilot reviewed 100 out of 106 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
plugin.yml	Added new commands (set, freshpants), fixed description formatting
build.gradle.kts	Upgraded Kotlin, optimized dependencies, added dev tasks, minimization config
Timer.kt	Added tickInterval parameter for throttled callbacks
Player.kt	Added utility functions for inventory management and item checking
NPC.kt	Refactored to centralized handler with level-gated access
ItemStack.kt	Added color support, data parameter, leather armor coloring
GUI.kt	Enhanced with dynamic sizing, close handlers, locked slots
Shop.kt	Complete shop GUI implementation with dynamic pricing and multi-items
Items (various)	New shop/default/mystic item implementations
Enchants (various)	New enchantments and description refactoring
Commands	Added SetStats and FreshPantsCommand, refactored to PluginCommand interface
DamageIndicator.kt	New damage indicator display system
Main.kt	Updated registration for items, commands, and NPC handler

Files not reviewed (5)

.idea/copilot.data.migration.agent.xml: Language not supported
.idea/gradle.xml: Language not supported
.idea/kotlinc.xml: Language not supported
.idea/misc.xml: Language not supported
.idea/vcs.xml: Language not supported

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-12-26T04:27:49Z

src/main/kotlin/org/thepitcommunityserver/util/NPC.kt

+        if (player.data.level < level) {
+            player.sendMessage(replaceChatColorTags("<red>You must be level $level to access this!</red>"))
+            player.playSound(player.location, Sound.VILLAGER_NO, 1.0f, 1.0f)
+//             return // TODO: UNCOMMENT FOR PRODUCTION


The TODO comment references a production check that is currently commented out. This allows any player regardless of level to access NPCs. Either remove the TODO and commented code if this is intentional for development, or uncomment line 117 for production builds.

Copilot · 2025-12-26T04:27:49Z

src/main/kotlin/org/thepitcommunityserver/util/ItemStack.kt

    return rootNBT.getString(pitItemIdKey(signature))
 }
+
+// Will nee to overhaul


Typo in comment: "Will nee to overhaul" should be "Will need to overhaul".

Copilot · 2025-12-26T04:27:50Z

src/main/kotlin/org/thepitcommunityserver/game/enchants/Explosive.kt

+            val enchantTier = it.enchantTier
+            val range = range[enchantTier] ?: undefPropErr("range", enchantTier)
+            val explosionPitch = explosionPitch[enchantTier] ?: undefPropErr("explosionPitch", enchantTier)
+            val explosionParticle = explosionParticle[enchantTier] ?: undefPropErr("explosion)Particle", enchantTier)


Typo in variable name: "explosion)Particle" should be "explosionParticle" (closing parenthesis should be removed).

Copilot · 2025-12-26T04:27:50Z

src/main/kotlin/org/thepitcommunityserver/game/items/shopItems/PantsBundle.kt

+            for (item in contents) {
+                if (item.type == Material.LEATHER_HELMET) {
+                    freshPants.add(item)
+                }
+            }


Incomplete implementation: The check for Material.LEATHER_HELMET on line 109 should check for Material.LEATHER_LEGGINGS since this is a pants bundle. Using helmet material will check for the wrong item type.

Copilot · 2025-12-26T04:27:50Z

src/main/kotlin/org/thepitcommunityserver/game/enchants/Healer.kt

+        )
+
+    private val description: EnchantDescription = {
+        "Your hits <green>heal</green> you for <red>${damagedHearts[it]?.toInt()}${Text.HEART}</red><br/>and them for <red>${damagerHearts[it]?.toInt()}${Text.HEART}</red> ($cooldown}s cooldown)"


The string interpolation syntax $cooldown}s is missing the opening brace. It should be ${cooldown.seconds()}s to properly display the cooldown value.

Copilot · 2025-12-26T04:27:50Z

src/main/kotlin/org/thepitcommunityserver/util/Player.kt

+fun playerHasItem(player: Player, material: Material): Boolean {
+    val inventory = player.inventory
+
+    // Check armor slots
+    val hasEquipped = when {
+        isHelmet(material) -> inventory.helmet?.type == material
+        isChestplate(material) -> inventory.chestplate?.type == material
+        isLeggings(material) -> inventory.leggings?.type == material
+        isBoots(material) -> inventory.boots?.type == material
+        else -> false
+    }
+
+    if (!hasEquipped) {
+        return false
+    }
+
+    // Check main inventory
+    return inventory.contents.any { it?.type == material }
+}


The logic check if (!hasEquipped) on line 74 returns false, but the function then unconditionally returns true on line 79, meaning this function will always return true regardless of whether the armor piece is equipped. The logic should be: return true if the player HAS the item equipped OR in inventory, not check if they don't have it equipped then always return true.

Copilot · 2025-12-26T04:27:51Z

src/main/kotlin/org/thepitcommunityserver/util/ItemStack.kt

+    if (isLeather(material) && isLeggings(material)) {
+        itemMeta = itemMeta as LeatherArmorMeta
+        itemMeta.color = pantsColors(itemColor ?: "white")
+    }


The condition checks if the item is both leather AND leggings, but it should check if it's leather leggings specifically. The current logic will never execute because isLeather(material) && isLeggings(material) can only be true for Material.LEATHER_LEGGINGS. Consider simplifying to material == Material.LEATHER_LEGGINGS.

Copilot · 2025-12-26T04:27:51Z

src/main/kotlin/org/thepitcommunityserver/game/enchants/Explosive.kt

+                    // Prevent self damage
+                    if (entity !== shooter) return@forEach


The condition if (entity !== shooter) on line 95 inverts the logic - it returns early if the entity is NOT the shooter, meaning only the shooter will receive damage. This should be if (entity == shooter) to prevent self-damage as the comment indicates.

Copilot · 2025-12-26T04:27:51Z

src/main/kotlin/org/thepitcommunityserver/game/events/Spawn.kt

+        if (respawnLocations.isEmpty()) {
+            player.teleport(randomSpawnLocation)
+        } else {
+            val location = respawnLocations.remove(player.uniqueId)
+            player.teleport(location)
+        }


The respawnLocations check on line 39 uses isEmpty() but should check if the map contains the player's UUID. An empty map would prevent all players from using tactical insertion. Change to if (!respawnLocations.containsKey(player.uniqueId)) or use respawnLocations[player.uniqueId] with null-safe handling.

Copilot · 2025-12-26T04:27:51Z

src/main/kotlin/org/thepitcommunityserver/util/Timer.kt

+        var tickCount = 0
+        val throttledOnTick = onTick?.let {
+            Runnable {
+                if ((tickCount % tickInterval).toInt() == 0) {
+                    it.run()
+                }
+                tickCount++
+            }


The tickCount variable is never incremented in the throttled onTick callback. This means the modulo check will always evaluate to true on the first call, and the counter will never advance. Move the tickCount++ statement before the if condition, or redesign the logic to properly track tick intervals.

Haberno added 3 commits June 22, 2025 21:35

Fix Citizens Plugin not working

2bc1d9f

- b3147 is the final working version that is compatible with 1.8.8 upgrading will break it as the newer plugin ymls use a syntax that doesn't work with the old bukkit parser.

- Update README and fix windows build tools script

0b5cfbe

- Fix eventLister for CombatStatus and fix plugin yml parsing

ee79ea1

Haberno requested a review from estebangarcia21 June 23, 2025 01:42

Haberno added 26 commits June 22, 2025 23:17

- Add item purchasing

c4b8a2c

// TODO Find correct sounds // TODO needs to implement dynamic GUIs

Fix minor issues

4846daa

add the small period

af12165

- Add villager level requirements (keep them working for development)

9795ddc

- Fix typos - Register NPC separately so we can add our own custom Metadata CITIZENS API SUCKKKKKS

Add table columns to handle player unlocks and prestige currency

6631666

Fix enchants to match pit behaviour and apply consistent formatting

eb84aa1

Update introduce command interface and add command to set player stats

61aaf46

add new gradle tasks to simplify development

6174461

update kotlin version

f3846d7

new commands registration

9882119

add new enchants

781cc54

add items

b22c5de

add damage Indicator

f89ef74

register lava mechanics fix

4e8be8e

update inventory management

35869ee

add very true damage

fc863f5

NPC shop functionality

1ba0d9a

remove old commands registeration

edd79f5

fix imports

e4e404b

reduce spawn protection area

5dc920d

add getItemLore function

acb983a

all other changes

feb2438

fix refactor import issue

fe25905

add jump boost 4 functionality

87effda

add Combat Spade damage and unique ability

3a70e7d

add Golden pickaxe ability

1e531ff

Haberno added 3 commits December 23, 2025 20:03

add Tactical Insertion Ability

26811bc

Add fresh pants

9a306ee

add FIrst Aid Egg

566e84d

Copilot AI review requested due to automatic review settings December 26, 2025 04:24

Copilot started reviewing on behalf of Haberno December 26, 2025 04:24 View session

Copilot AI reviewed Dec 26, 2025

View reviewed changes

add FIrst Aid Egg

6f129d6

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bugfix/DEV-1 #130

bugfix/DEV-1 #130

Uh oh!

Haberno commented Jun 23, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		// Prevent self damage
		if (entity !== shooter) return@forEach

bugfix/DEV-1 #130

Are you sure you want to change the base?

bugfix/DEV-1 #130

Uh oh!

Conversation

Haberno commented Jun 23, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Reviewed changes

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants