Skip to content

change#488

Merged
Nandi0813 merged 36 commits into
masterfrom
dev
May 25, 2026
Merged

change#488
Nandi0813 merged 36 commits into
masterfrom
dev

Conversation

@Nandi0813
Copy link
Copy Markdown
Collaborator

No description provided.

Copilot AI review requested due to automatic review settings April 18, 2026 14:19
Copy link
Copy Markdown
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

Removes two inline explanatory comments in setFightPlayer, leaving the functional behavior unchanged.

Changes:

  • Deleted a comment about restoring combat hitboxes before re-enabling entity collision.
  • Deleted a comment about clearing invulnerability frames (no corresponding logic exists here).

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


gui.remove(entry.getKey());
for (Player player : inGuiPlayers.keySet()) {
if (inGuiPlayers.get(player) == entry.getKey()) {
private final Map<Integer, NormalLadder> ladderSlots = new HashMap<>();
private final int spaces = 45;
private final Map<Integer, Map<Integer, NormalLadder>> ladderSlots = new HashMap<>();
private final Map<Player, Integer> backToPage = new HashMap<>();
};
inventory = splitInventory;
}
private Map<Integer, CustomKit> loadCustomKitSet(NormalLadder ladder, String name, String type) {

private static boolean executeWriteWithRetry(String operation, SqlWriteOperation writeOperation) {
int attempt = 1;
while (attempt <= RETRYABLE_WRITE_MAX_ATTEMPTS) {
13,
ConfigManager.getString("EVENT.BRACKETS.NAME"),
ItemCreateUtil.createItem("&aBrackets", Material.POTION, Short.valueOf("34")),
ItemCreateUtil.createItem("<green>Brackets", Material.POTION, Short.valueOf("34")),
lokspel and others added 12 commits May 19, 2026 12:43
* fix: fix profile worldtime default value and handle offline players in leaderboards

* fix: resolve party chat permission error caused by missing break

* fix: not-won round symbols rendering as filled on scoreboard

* Prevent throwing ender peal if cooldown is 0.0 in the start of the match

* fix: shade MariaDB driver to prevent classpath conflict with other plugins

* fix: remove players from live match on rejoin if they disconnected during duel acceptance

* Refactor Profile

* Refactor Profile

* Fix for #536

* Full MiniMessage support

* hex/legacy color code support

* add missing ladder

* Fix sidebar
try (InputStream in = practice.getResource("config.yml")) {
if (in == null) return Collections.emptyMap();
bundled = new YamlConfiguration();
bundled.load(new InputStreamReader(in));
@Nandi0813 Nandi0813 merged commit 8024030 into master May 25, 2026
2 checks passed
@Nandi0813 Nandi0813 deleted the dev branch May 25, 2026 16:39
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.

4 participants