Skip to content

dev#302

Merged
Nandi0813 merged 39 commits intomasterfrom
dev
Mar 17, 2026
Merged

dev#302
Nandi0813 merged 39 commits intomasterfrom
dev

Conversation

@Nandi0813
Copy link
Collaborator

No description provided.

- Spectator State Not Clearing on Transition
- Ladder Validation Fails for FFA-Only Ladders
- Incorrect Self-Attribution in Void Death Messages
Copilot AI review requested due to automatic review settings March 9, 2026 14:55
@Nandi0813 Nandi0813 changed the title fixed: dev Mar 9, 2026
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adjusts ladder enablement rules and spectating behavior to better support FFA ladders/spectator switching, and tightens kill attribution logic in matches.

Changes:

  • Allow enabling normal ladders without requiring matchTypes to be assigned.
  • When spectating an FFA, automatically stop spectating any previous match/FFA first; allow /ffa spectate from SPECTATE status.
  • Prevent awarding void-kill credit to the victim themself when using “last attacker” attribution.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
core/src/main/java/dev/nandi0813/practice/manager/ladder/util/LadderUtil.java Removes the “no match type assigned” gate when enabling a ladder.
core/src/main/java/dev/nandi0813/practice/manager/ladder/abstraction/normal/NormalLadder.java Updates isReadyToEnable() to no longer require non-empty matchTypes; adds (currently unused) import.
core/src/main/java/dev/nandi0813/practice/manager/fight/match/Match.java Avoids crediting the victim as killer in void attribution logic.
core/src/main/java/dev/nandi0813/practice/manager/fight/ffa/game/FFA.java Removes a spectator from any prior Spectatable before adding them to this FFA.
core/src/main/java/dev/nandi0813/practice/command/ffa/arguments/SpectateArg.java Permits running and tab-completing the spectate command from SPECTATE status.

💡 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.

Nandi0813 and others added 24 commits March 10, 2026 09:30
- Mace Smash Kill
enhancements:
- duel right click only with unranked item
- FFA arena selector GUI
* fix(chat): escape MiniMessage tags in player messages

* fix(chat): escape MiniMessage tags in player messages
…e-Pro into dev

# Conflicts:
#	spigot_1_8_8/src/main/java/dev/nandi0813/practice_1_8_8/listener/PlayerChatListener.java
if (ffa.getPlayers().containsKey(player)) {
Ladder oldLadder = ffa.getPlayers().get(player);
if (oldLadder == ladder) {
Common.sendMMMessage(player, LanguageManager.getString("FFA.COMMAND.KIT.ALREADY-IN-KIT").replace("%ladder%", ladder.getDisplayName()));
@Nandi0813 Nandi0813 merged commit 11d713f into master Mar 17, 2026
2 checks passed
@Nandi0813 Nandi0813 deleted the dev branch March 17, 2026 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants