Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Grasscutter
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ziqian zhang
Grasscutter
Commits
dd10dcc0
Commit
dd10dcc0
authored
2 years ago
by
AnimeGitB
Browse files
Options
Downloads
Patches
Plain Diff
Fix HelpCommand missing aliases
parent
466488ca
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/command/CommandMap.java
+3
-3
3 additions, 3 deletions
src/main/java/emu/grasscutter/command/CommandMap.java
src/main/java/emu/grasscutter/command/commands/HelpCommand.java
+8
-9
8 additions, 9 deletions
...in/java/emu/grasscutter/command/commands/HelpCommand.java
with
11 additions
and
12 deletions
src/main/java/emu/grasscutter/command/CommandMap.java
+
3
−
3
View file @
dd10dcc0
...
@@ -83,7 +83,7 @@ public final class CommandMap {
...
@@ -83,7 +83,7 @@ public final class CommandMap {
return
new
LinkedList
<>(
this
.
annotations
.
values
());
return
new
LinkedList
<>(
this
.
annotations
.
values
());
}
}
public
Hash
Map
<
String
,
Command
>
getAnnotations
()
{
public
Map
<
String
,
Command
>
getAnnotations
()
{
return
new
LinkedHashMap
<>(
this
.
annotations
);
return
new
LinkedHashMap
<>(
this
.
annotations
);
}
}
...
@@ -96,8 +96,8 @@ public final class CommandMap {
...
@@ -96,8 +96,8 @@ public final class CommandMap {
return
new
LinkedList
<>(
this
.
commands
.
values
());
return
new
LinkedList
<>(
this
.
commands
.
values
());
}
}
public
Hash
Map
<
String
,
CommandHandler
>
getHandlers
()
{
public
Map
<
String
,
CommandHandler
>
getHandlers
()
{
return
new
LinkedHashMap
<>(
this
.
commands
)
;
return
this
.
commands
;
}
}
/**
/**
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/command/commands/HelpCommand.java
+
8
−
9
View file @
dd10dcc0
...
@@ -46,25 +46,25 @@ public final class HelpCommand implements CommandHandler {
...
@@ -46,25 +46,25 @@ public final class HelpCommand implements CommandHandler {
@Override
@Override
public
void
execute
(
Player
player
,
Player
targetPlayer
,
List
<
String
>
args
)
{
public
void
execute
(
Player
player
,
Player
targetPlayer
,
List
<
String
>
args
)
{
Account
account
=
(
player
==
null
)
?
null
:
player
.
getAccount
();
Account
account
=
(
player
==
null
)
?
null
:
player
.
getAccount
();
Map
<
String
,
CommandHandler
>
handlers
=
CommandMap
.
getInstance
()
.
getHandlers
()
;
var
commandMap
=
CommandMap
.
getInstance
();
List
<
String
>
commands
=
new
ArrayList
<>();
List
<
String
>
commands
=
new
ArrayList
<>();
List
<
String
>
commands_no_permission
=
new
ArrayList
<>();
List
<
String
>
commands_no_permission
=
new
ArrayList
<>();
if
(
args
.
isEmpty
())
{
if
(
args
.
isEmpty
())
{
for
(
String
key
:
handlers
.
keySet
())
{
commandMap
.
getHandlers
().
forEach
((
key
,
command
)
->
{
CommandHandler
command
=
handlers
.
get
(
key
);
Command
annotation
=
command
.
getClass
().
getAnnotation
(
Command
.
class
);
Command
annotation
=
command
.
getClass
().
getAnnotation
(
Command
.
class
);
if
(
player
==
null
||
account
.
hasPermission
(
annotation
.
permission
()))
{
if
(
player
==
null
||
account
.
hasPermission
(
annotation
.
permission
()))
{
commands
.
add
(
createCommand
(
player
,
command
,
args
));
commands
.
add
(
createCommand
(
player
,
command
,
args
));
}
else
if
(
SHOW_COMMANDS_WITHOUT_PERMISSIONS
)
{
}
else
if
(
SHOW_COMMANDS_WITHOUT_PERMISSIONS
)
{
commands_no_permission
.
add
(
createCommand
(
player
,
command
,
args
));
commands_no_permission
.
add
(
createCommand
(
player
,
command
,
args
));
}
}
}
}
);
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.help.available_commands"
);
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.help.available_commands"
);
}
else
{
}
else
{
String
command_str
=
args
.
remove
(
0
).
toLowerCase
();
String
command_str
=
args
.
remove
(
0
).
toLowerCase
();
CommandHandler
command
=
handlers
.
get
(
command_str
);
CommandHandler
command
=
commandMap
.
getHandler
(
command_str
);
if
(
command
==
null
)
{
if
(
command
==
null
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.generic.command_exist_error"
);
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.generic.command_exist_error"
);
CommandHandler
.
sendMessage
(
player
,
"Command: "
+
command_str
);
return
;
return
;
}
else
{
}
else
{
Command
annotation
=
command
.
getClass
().
getAnnotation
(
Command
.
class
);
Command
annotation
=
command
.
getClass
().
getAnnotation
(
Command
.
class
);
...
@@ -75,9 +75,8 @@ public final class HelpCommand implements CommandHandler {
...
@@ -75,9 +75,8 @@ public final class HelpCommand implements CommandHandler {
}
}
}
}
}
}
for
(
String
s
:
commands
)
final
String
suf
=
"\n\t"
+
translate
(
player
,
"commands.help.warn_player_has_no_permission"
);
CommandHandler
.
sendMessage
(
player
,
s
);
commands
.
forEach
(
s
->
CommandHandler
.
sendMessage
(
player
,
s
));
for
(
String
s
:
commands_no_permission
)
commands_no_permission
.
forEach
(
s
->
CommandHandler
.
sendMessage
(
player
,
s
+
suf
));
CommandHandler
.
sendMessage
(
player
,
s
+
"\n\t"
+
translate
(
player
,
"commands.help.warn_player_has_no_permission"
));
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment