// If any @UID argument is present, override targetPlayer with it.
for(inti=0;i<args.size();i++){
Stringarg=args.get(i);
...
...
@@ -188,11 +198,11 @@ public final class CommandMap {
}
}
}
// If there's still no targetPlayer at this point, use previously-set target
if(targetPlayer==null){
if(targetPlayerIds.containsKey(playerId)){
targetPlayer=Grasscutter.getGameServer().getPlayerByUid(targetPlayerIds.get(playerId),true);// We check every time in case the target is deleted after being targeted
if(this.targetPlayerIds.containsKey(playerId)){
targetPlayer=Grasscutter.getGameServer().getPlayerByUid(this.targetPlayerIds.get(playerId),true);// We check every time in case the target is deleted after being targeted