Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

/effect and /xp now extend VanillaCommand too! Like the other 42 commands.... #2197

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

/effect and /xp now extend VanillaCommand too! Like the other 42 commands.... #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a533d24
fix allowChangesFrom giving incorrect result
Yexeed Aug 29, 2024
8ba28b6
make /xp and /effect to be vanilla comamnds
Yexeed Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/cn/nukkit/command/Command.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public boolean unregister(CommandMap commandMap) {
}

public boolean allowChangesFrom(CommandMap commandMap) {
return commandMap != null && !commandMap.equals(this.commandMap);
return this.commandMap == null || this.commandMap.equals(commandMap);
Copy link
Member

Choose a reason for hiding this comment

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

Unrelated change

}

public boolean isRegistered() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/cn/nukkit/command/defaults/EffectCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* Created by Snake1999 and Pub4Game on 2016/1/23.
* Package cn.nukkit.command.defaults in project nukkit.
*/
public class EffectCommand extends Command {
public class EffectCommand extends VanillaCommand {
public EffectCommand(String name) {
super(name, "%nukkit.command.effect.description", "%commands.effect.usage");
this.setPermission("nukkit.command.effect");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/cn/nukkit/command/defaults/XpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Created by Snake1999 on 2016/1/22.
* Package cn.nukkit.command.defaults in project nukkit.
*/
public class XpCommand extends Command {
public class XpCommand extends VanillaCommand {
public XpCommand(String name) {
super(name, "%nukkit.command.xp.description", "%commands.xp.usage");
this.setPermission("nukkit.command.xp");
Expand Down
Loading