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
32289e2d
Unverified
Commit
32289e2d
authored
2 years ago
by
jie65535
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add permission clear and list commands (#1715)
* Add permission clear and list commands * Add Account clear permission
parent
656cb79b
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
+21
-4
21 additions, 4 deletions
...a/emu/grasscutter/command/commands/PermissionCommand.java
src/main/java/emu/grasscutter/game/Account.java
+4
-0
4 additions, 0 deletions
src/main/java/emu/grasscutter/game/Account.java
with
25 additions
and
4 deletions
src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
+
21
−
4
View file @
32289e2d
...
...
@@ -11,12 +11,17 @@ import java.util.List;
import
static
emu
.
grasscutter
.
utils
.
Language
.
translate
;
@Command
(
label
=
"permission"
,
usage
=
"(add|remove) <permission>"
,
permission
=
"permission"
,
targetRequirement
=
TargetRequirement
.
PLAYER
)
@Command
(
label
=
"permission"
,
usage
=
{
"add <permission>"
,
"remove <permission>"
,
"clear"
,
"list"
},
permission
=
"permission"
,
targetRequirement
=
TargetRequirement
.
PLAYER
)
public
final
class
PermissionCommand
implements
CommandHandler
{
@Override
public
void
execute
(
Player
sender
,
Player
targetPlayer
,
List
<
String
>
args
)
{
if
(
args
.
size
()
!=
2
)
{
if
(
args
.
isEmpty
()
||
args
.
size
()
>
2
)
{
sendUsageMessage
(
sender
);
return
;
}
...
...
@@ -27,7 +32,10 @@ public final class PermissionCommand implements CommandHandler {
}
String
action
=
args
.
get
(
0
);
String
permission
=
args
.
get
(
1
);
String
permission
=
""
;
if
(
args
.
size
()
>
1
)
{
permission
=
args
.
get
(
1
);
}
Account
account
=
targetPlayer
.
getAccount
();
if
(
account
==
null
)
{
...
...
@@ -40,7 +48,9 @@ public final class PermissionCommand implements CommandHandler {
sendUsageMessage
(
sender
);
break
;
case
"add"
:
if
(
account
.
addPermission
(
permission
))
{
if
(
permission
.
isEmpty
())
{
sendUsageMessage
(
sender
);
}
else
if
(
account
.
addPermission
(
permission
))
{
CommandHandler
.
sendMessage
(
sender
,
translate
(
sender
,
"commands.permission.add"
));
}
else
CommandHandler
.
sendMessage
(
sender
,
translate
(
sender
,
"commands.permission.has_error"
));
break
;
...
...
@@ -49,6 +59,13 @@ public final class PermissionCommand implements CommandHandler {
CommandHandler
.
sendMessage
(
sender
,
translate
(
sender
,
"commands.permission.remove"
));
}
else
CommandHandler
.
sendMessage
(
sender
,
translate
(
sender
,
"commands.permission.not_have_error"
));
break
;
case
"clear"
:
account
.
clearPermission
();
CommandHandler
.
sendMessage
(
sender
,
translate
(
sender
,
"commands.permission.remove"
));
break
;
case
"list"
:
CommandHandler
.
sendMessage
(
sender
,
String
.
join
(
"\n"
,
account
.
getPermissions
()));
break
;
}
account
.
save
();
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/game/Account.java
+
4
−
0
View file @
32289e2d
...
...
@@ -210,6 +210,10 @@ public class Account {
return
this
.
permissions
.
remove
(
permission
);
}
public
void
clearPermission
()
{
this
.
permissions
.
clear
();
}
// TODO make unique
public
String
generateLoginToken
()
{
this
.
token
=
Utils
.
bytesToHex
(
Crypto
.
createSessionKey
(
32
));
...
...
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