Conversation
… killing another player
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the core plugin’s configuration and gameplay logic, mainly adding new FFA arena behavior (health reset on kill), making party size limits group-based, and improving rollback/stability behaviors during matches and arena resets.
Changes:
- Add Health Reset On Kill as an FFA arena setting (config + GUI + runtime behavior).
- Introduce group-based party member limits and refresh party limits when a leader’s group changes.
- Improve rollback reliability (vine-like blocks ordering, callback on rollback completion) and add additional null-safety in combat/event listeners.
Reviewed changes
Copilot reviewed 27 out of 27 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| core/src/main/resources/guis.yml | Adds GUI text/icons for the new FFA “Health Reset On Kill” setting and bumps GUI config version. |
| core/src/main/resources/groups.yml | Adds PARTY-MEMBER-LIMIT per group and bumps groups config version. |
| core/src/main/resources/config.yml | Adds default FFA HEALTH-RESET-ON-KILL setting; removes party limit “PERMISSION” config; bumps config version. |
| core/src/main/java/dev/nandi0813/practice/util/fightmapchange/FightChangeOptimized.java | Adds rollback callback + vine-like top-down restoration ordering; updates quickRollback ordering. |
| core/src/main/java/dev/nandi0813/practice/manager/profile/group/GroupManager.java | Loads PARTY-MEMBER-LIMIT from groups.yml with fallback to config default. |
| core/src/main/java/dev/nandi0813/practice/manager/profile/group/Group.java | Extends Group model to include partyMemberLimit. |
| core/src/main/java/dev/nandi0813/practice/manager/profile/Profile.java | Refreshes party max limit when a leader’s group changes. |
| core/src/main/java/dev/nandi0813/practice/manager/party/PartyManager.java | Resolves per-player party size limit from the player’s Group (fallback to config default). |
| core/src/main/java/dev/nandi0813/practice/manager/party/Party.java | Initializes/refreshes maxPlayerLimit using group-based limits. |
| core/src/main/java/dev/nandi0813/practice/manager/ladder/type/Boxing.java | Adds null-safety around match statistics access. |
| core/src/main/java/dev/nandi0813/practice/manager/gui/setup/arena/arenasettings/ffa/FFASettingsGui.java | Adds GUI toggle + slot layout changes for health reset on kill. |
| core/src/main/java/dev/nandi0813/practice/manager/gui/guis/party/PartySettingsGui.java | Caps party limit adjustments to the leader’s group limit. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/util/PlayerUtil.java | Adds “player stuck” helper and adjusts inventory drop cursor handling. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/util/ChangedBlock.java | Improves block snapshotting via BlockState for accurate rollback in replaceable-block scenarios. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/match/listener/LadderTypeListener.java | Modernizes pickup event handling and adds null-safety in match damage/death handling. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/match/Match.java | Null-safes deathMessage replacement and teleports stuck spectators after build rollback. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/listener/BuildListener.java | Tracks replaced non-solid blocks via replaced-state snapshots for better rollback accuracy. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/FFAArenaSelectorGui.java | Displays the new health reset status in arena selector lore. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/FFA.java | Implements health reset on kill + stuck spectator teleport after rollback (via callback). |
| core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/BuildRollback.java | Wires rollback completion callback into FightChangeOptimized rollback. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/FFAListener.java | Improves killer resolution logic for FFA deaths. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/event/runnables/queue/QueueStartRunnable.java | Removes event-start decrement from queue runnable (moved elsewhere). |
| core/src/main/java/dev/nandi0813/practice/manager/fight/event/interfaces/Event.java | Makes startQueue return boolean for success/failure. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/event/EventManager.java | Makes startEvent return boolean; adds permission/limit checks and decrements event-start count after successful queue start. |
| core/src/main/java/dev/nandi0813/practice/manager/fight/event/EventListener.java | Adds null checks for profile/event retrieval. |
| core/src/main/java/dev/nandi0813/practice/manager/arena/arenas/FFAArena.java | Persists and defaults the new healthResetOnKill arena flag. |
| core/src/main/java/dev/nandi0813/practice/listener/PlayerInteract.java | Refactors soup handling with earlier guards and profile null-check. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
| @@ -98,13 +98,14 @@ public void handleClickEvent(InventoryClickEvent e) { | |||
| Common.sendMMMessage(player, LanguageManager.getString("PARTY.NO-PERMISSION")); | |||
Comment on lines
+74
to
75
| if (!cursor.getType().equals(Material.AIR)) | ||
| entities.add(player.getWorld().dropItemNaturally(player.getLocation(), cursor)); |
Comment on lines
+239
to
+246
| public static boolean isPlayerStuck(Player player) { | ||
| Block feetBlock = player.getLocation().getBlock(); | ||
| Block headBlock = player.getEyeLocation().getBlock(); | ||
|
|
||
| boolean isFeetSolid = feetBlock.getType().isSolid(); | ||
| boolean isHeadSolid = headBlock.getType().isSolid(); | ||
|
|
||
| return isFeetSolid || isHeadSolid; |
…option to main gui
* Fix Lobby knockback * Add missing lobby protection * fix: prevent arrow hit message when damage event is cancelled
added permission explanation of cosmetics to README.md added cosmetics icon to lobby inventory
![github-code-quality[bot]](https://avatars.githubusercontent.com/u/9919?s=60&v=4){kind=small}
|
|
||
| // ── Builders ───────────────────────────────────────────────────── | ||
|
|
||
| private ItemStack buildLayoutItem(ShieldLayout layout, int index, boolean active) { |
| private ArmorTrimTier activeTier = ArmorTrimTier.LEATHER; | ||
| private DeathEffect deathEffect = DeathEffect.NONE; | ||
|
|
||
| private final List<ShieldLayout> shieldLayouts = new ArrayList<>(); |
| private DyeColor baseColor; | ||
|
|
||
| /** Ordered list of pattern layers (like a real banner – bottom → top). */ | ||
| private final List<PatternLayer> layers; |
| case RematchInvItem rematchInvItem -> { | ||
| continue; | ||
| } | ||
| case CosmeticsInvItem cosmeticsInvItem -> { |
This reverts commit 1cae3c1.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.