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
735b48ed
Commit
735b48ed
authored
2 years ago
by
AnimeGitB
Browse files
Options
Downloads
Patches
Plain Diff
Add command targeting by account username
parent
735f7653
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/emu/grasscutter/command/CommandMap.java
+43
-25
43 additions, 25 deletions
src/main/java/emu/grasscutter/command/CommandMap.java
with
43 additions
and
25 deletions
src/main/java/emu/grasscutter/command/CommandMap.java
+
43
−
25
View file @
735b48ed
package
emu.grasscutter.command
;
import
emu.grasscutter.Grasscutter
;
import
emu.grasscutter.database.DatabaseHelper
;
import
emu.grasscutter.game.player.Player
;
import
it.unimi.dsi.fastutil.objects.Object2IntMap
;
import
it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap
;
import
org.reflections.Reflections
;
import
java.net.IDN
;
...
...
@@ -15,7 +19,8 @@ public final class CommandMap {
private
final
Map
<
String
,
CommandHandler
>
commands
=
new
TreeMap
<>();
private
final
Map
<
String
,
CommandHandler
>
aliases
=
new
TreeMap
<>();
private
final
Map
<
String
,
Command
>
annotations
=
new
TreeMap
<>();
private
final
Map
<
String
,
Integer
>
targetPlayerIds
=
new
HashMap
<>();
private
final
Object2IntMap
<
String
>
targetPlayerIds
=
new
Object2IntOpenHashMap
<>();
private
static
final
int
INVALID_UID
=
Integer
.
MIN_VALUE
;
private
static
final
String
consoleId
=
"console"
;
public
CommandMap
()
{
...
...
@@ -119,6 +124,20 @@ public final class CommandMap {
return
handler
;
}
private
static
int
getUidFromString
(
String
input
)
{
try
{
return
Integer
.
parseInt
(
input
);
}
catch
(
NumberFormatException
ignored
)
{
var
account
=
DatabaseHelper
.
getAccountByName
(
input
);
if
(
account
==
null
)
return
INVALID_UID
;
var
player
=
DatabaseHelper
.
getPlayerByAccount
(
account
);
if
(
player
==
null
)
return
INVALID_UID
;
// We will be immediately fetching the player again after this,
// but offline vs online Player safety is more important than saving a lookup
return
player
.
getUid
();
}
}
private
Player
getTargetPlayer
(
String
playerId
,
Player
player
,
Player
targetPlayer
,
List
<
String
>
args
)
{
// Top priority: If any @UID argument is present, override targetPlayer with it.
for
(
int
i
=
0
;
i
<
args
.
size
();
i
++)
{
...
...
@@ -130,18 +149,17 @@ public final class CommandMap {
// This is specifically to allow in-game players to run a command without targeting themselves or anyone else.
return
null
;
}
try
{
int
uid
=
Integer
.
parseInt
(
arg
);
targetPlayer
=
Grasscutter
.
getGameServer
().
getPlayerByUid
(
uid
,
true
);
if
(
targetPlayer
==
null
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.execution.player_exist_error"
);
throw
new
IllegalArgumentException
();
}
return
targetPlayer
;
}
catch
(
NumberFormatException
e
)
{
int
uid
=
getUidFromString
(
arg
);
if
(
uid
==
INVALID_UID
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.generic.invalid.uid"
);
throw
new
IllegalArgumentException
();
}
targetPlayer
=
Grasscutter
.
getGameServer
().
getPlayerByUid
(
uid
,
true
);
if
(
targetPlayer
==
null
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.execution.player_exist_error"
);
throw
new
IllegalArgumentException
();
}
return
targetPlayer
;
}
}
...
...
@@ -153,7 +171,7 @@ public final class CommandMap {
// Next priority: Use previously-set target. (see /target [[@]UID])
if
(
targetPlayerIds
.
containsKey
(
playerId
))
{
targetPlayer
=
Grasscutter
.
getGameServer
().
getPlayerByUid
(
targetPlayerIds
.
get
(
playerId
),
true
);
targetPlayer
=
Grasscutter
.
getGameServer
().
getPlayerByUid
(
targetPlayerIds
.
get
Int
(
playerId
),
true
);
// We check every time in case the target is deleted after being targeted
if
(
targetPlayer
==
null
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.execution.player_exist_error"
);
...
...
@@ -168,28 +186,28 @@ public final class CommandMap {
private
boolean
setPlayerTarget
(
String
playerId
,
Player
player
,
String
targetUid
)
{
if
(
targetUid
.
equals
(
""
))
{
// Clears the default targetPlayer.
targetPlayerIds
.
remove
(
playerId
);
targetPlayerIds
.
remove
Int
(
playerId
);
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.execution.clear_target"
);
return
true
;
}
// Sets default targetPlayer to the UID provided.
try
{
int
uid
=
Integer
.
parseInt
(
targetUid
);
Player
targetPlayer
=
Grasscutter
.
getGameServer
().
getPlayerByUid
(
uid
,
true
);
if
(
targetPlayer
==
null
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.execution.player_exist_error"
);
return
false
;
}
targetPlayerIds
.
put
(
playerId
,
uid
);
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.execution.set_target"
,
targetUid
);
CommandHandler
.
sendTranslatedMessage
(
player
,
targetPlayer
.
isOnline
()?
"commands.execution.set_target_online"
:
"commands.execution.set_target_offline"
,
targetUid
);
return
true
;
}
catch
(
NumberFormatException
e
)
{
int
uid
=
getUidFromString
(
targetUid
);
if
(
uid
==
INVALID_UID
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.generic.invalid.uid"
);
return
false
;
}
Player
targetPlayer
=
Grasscutter
.
getGameServer
().
getPlayerByUid
(
uid
,
true
);
if
(
targetPlayer
==
null
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.execution.player_exist_error"
);
return
false
;
}
targetPlayerIds
.
put
(
playerId
,
uid
);
String
target
=
uid
+
" ("
+
targetPlayer
.
getAccount
().
getUsername
()
+
")"
;
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.execution.set_target"
,
target
);
CommandHandler
.
sendTranslatedMessage
(
player
,
targetPlayer
.
isOnline
()
?
"commands.execution.set_target_online"
:
"commands.execution.set_target_offline"
,
target
);
return
true
;
}
/**
...
...
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