GH-343 fix: block namespaced commands during combat and add regression test by vLuckyyy · Pull Request #343 · EternalCodeTeam/EternalCombat

vLuckyyy · 2026-02-15T19:23:58Z

No description provided.

gemini-code-assist · 2026-02-15T19:24:14Z

Summary of Changes

Hello @vLuckyyy, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refactors the command blocking mechanism during combat by introducing a specialized controller. This change enhances the accuracy and reliability of command restriction, particularly for namespaced commands, and improves testability by adding dedicated unit tests for the new logic. The overall impact is a more robust and maintainable system for managing player actions during combat.

Highlights

New Command Blocking Controller: Introduced a dedicated FightCommandController to centralize and improve the logic for blocking commands during combat, separating it from the general FightActionBlockerController.
Enhanced Command Parsing: The new command controller includes robust logic to normalize commands, correctly handling leading slashes, namespaced commands (e.g., /minecraft:tp), and collapsing multiple spaces for accurate matching against restricted lists.
Regression Tests for Command Logic: Added comprehensive unit tests for the FightCommandController's normalizeCommand and matches methods, ensuring the command blocking logic functions as expected for various input formats.
Build System Updates: Updated Gradle build files to include necessary test dependencies like MockBukkit and Mockito, and the JUnit Platform Launcher, facilitating better unit testing practices.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog

buildSrc/src/main/kotlin/eternalcombat-java-unit-test.gradle.kts
- Added junit-platform-launcher as a test runtime dependency.
eternalcombat-plugin/build.gradle.kts
- Applied the eternalcombat-java-unit-test plugin.
- Added mockbukkit-v1.21 and mockito-core as test implementation dependencies.
eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java
- Imported FightCommandController.
- Registered FightCommandController in the plugin's onEnable method.
eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightActionBlockerController.java
- Removed imports for WhitelistBlacklistMode and StringUtil.
- Removed the onPlayerCommandPreprocess event handler, delegating command blocking to the new controller.
eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightCommandController.java
- Added a new class FightCommandController to handle command blocking during combat.
- Implemented static utility methods normalizeCommand and matches for robust command parsing and comparison.
- Implemented an onPlayerCommandPreprocess event handler to cancel restricted commands for players in combat.
eternalcombat-plugin/test/com/eternalcode/combat/fight/controller/FightCommandControllerTest.java
- Added unit tests for the normalizeCommand method, covering various command formats including namespaces and whitespace.
- Added unit tests for the matches method, verifying correct command matching against restricted lists with exact and prefix matches.

Activity

No human activity (comments, reviews) has been recorded on this pull request yet.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request correctly addresses the issue of namespaced commands not being blocked during combat by refactoring the command checking logic into a new FightCommandController. The new implementation properly normalizes commands, stripping namespaces before checking them against the restricted list. The addition of unit tests for the new normalization and matching logic is a great improvement that ensures the fix is robust and prevents future regressions. My review includes a couple of suggestions: one important fix for a dependency in the build configuration and a minor performance improvement in the new controller.

buildSrc/src/main/kotlin/eternalcombat-java-unit-test.gradle.kts

...bat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightCommandController.java

Jakubk15

2026-02-19.12-19-20.mp4

This doesn't seem to work correctly. When I define eternalcore:msg explicitly as the blocked message, I expect only the /msg from EternalCore to be blocked. Your behavior would be correct when I would block msg, without the namespace defined.

imDMK · 2026-02-19T19:17:41Z

...bat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightCommandController.java

+    static String normalizeCommand(String command) {
+        if (command == null || command.isBlank()) {
+            return EMPTY;
+        }
+
+        String normalized = command.strip();
+
+        if (normalized.charAt(0) == SLASH) {
+            normalized = normalized.substring(1).stripLeading();
+        }
+
+        if (normalized.isEmpty()) {
+            return EMPTY;
+        }
+
+        int colonIndex = normalized.indexOf(NAMESPACE_SEPARATOR);
+        int firstSpaceIndex = normalized.indexOf(SPACE);
+
+        if (colonIndex >= 0 && (firstSpaceIndex < 0 || colonIndex < firstSpaceIndex)) {
+            normalized = normalized.substring(colonIndex + 1);
+        }
+
+        return WHITESPACE_PATTERN.matcher(normalized).replaceAll(SINGLE_SPACE);
+    }
+
+    static boolean matches(String command, List<String> restrictedCommands) {
+        if (command.isEmpty()) {
+            return false;
+        }
+
+        for (String restrictedCommand : restrictedCommands) {
+            String normalizedRestricted = normalizeCommand(restrictedCommand);
+
+            if (normalizedRestricted.isEmpty()) {
+                continue;
+            }
+
+            boolean exactMatch = command.equalsIgnoreCase(normalizedRestricted);
+            boolean prefixMatch = command.regionMatches(true, 0, normalizedRestricted, 0, normalizedRestricted.length())
+                && command.length() > normalizedRestricted.length()
+                && command.charAt(normalizedRestricted.length()) == SPACE;
+
+            if (exactMatch || prefixMatch) {
+                return true;
+            }
+        }
+
+        return false;
+    }


I would consider move that logic to other class to improve SRP. Currently this class is not only "controller"

fix: block namespaced commands during combat and add regression test

ed0faea

Fix.

5aa8d0a

gemini-code-assist bot reviewed Feb 15, 2026

View reviewed changes

buildSrc/src/main/kotlin/eternalcombat-java-unit-test.gradle.kts Show resolved Hide resolved

...bat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightCommandController.java Outdated Show resolved Hide resolved

Fix.

68a6ce2

EternalCodeTeam deleted a comment from chatgpt-codex-connector bot Feb 15, 2026

vLuckyyy changed the title ~~fix: block namespaced commands during combat and add regression test~~ GH-343 fix: block namespaced commands during combat and add regression test Feb 15, 2026

vLuckyyy requested review from CitralFlo, Jakubk15, Rollczi and imDMK February 15, 2026 19:32

Jakubk15 requested changes Feb 19, 2026

View reviewed changes

imDMK requested changes Feb 19, 2026

View reviewed changes

Jakubk15 added the 🐛 bug Something isn't working label Feb 20, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Comments

GH-343 fix: block namespaced commands during combat and add regression test#343

GH-343 fix: block namespaced commands during combat and add regression test#343
vLuckyyy wants to merge 3 commits intomasterfrom
fix/namespaced-command-bypass

vLuckyyy commented Feb 15, 2026

Uh oh!

gemini-code-assist bot commented Feb 15, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Uh oh!

Jakubk15 left a comment

Uh oh!

imDMK Feb 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Comments

Conversation

vLuckyyy commented Feb 15, 2026

Uh oh!

gemini-code-assist bot commented Feb 15, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Jakubk15 left a comment

Choose a reason for hiding this comment

Uh oh!

imDMK Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants