Skip to content

Commit 9198ca2

Browse files
committed
fix bug: Console print 'Unknown or incomplete command' when teleport to player
1 parent 1c09001 commit 9198ca2

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ minecraft_version=1.16.5
66
yarn_mappings=1.16.5+build.9
77
loader_version=0.11.3
88
# Mod Properties
9-
mod_version=1.1
9+
mod_version=1.2
1010
maven_group=io.github.optijava
1111
archives_base_name=opt-carpet-addition
1212
# Dependencies

src/main/java/io/github/optijava/opt_carpet_addition/commands/PlayerTpCommand.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private static int teleport(CommandContext<ServerCommandSource> context) {
4848
try {
4949
final String commandSourcePlayerName = context.getSource().getPlayer().getGameProfile().getName();
5050

51-
CarpetSettings.LOG.info("[OptCarpetAddition] " + commandSourcePlayerName + " submit command: /player " + StringArgumentType.getString(context, COMMAND_PREFIX) + " tp");
51+
CarpetSettings.LOG.info("[OptCarpetAddition] " + commandSourcePlayerName + " submit command: player " + StringArgumentType.getString(context, COMMAND_PREFIX) + " tp");
5252

5353
if (server.getPlayerManager().getPlayer(StringArgumentType.getString(context, COMMAND_PREFIX)) instanceof EntityPlayerMPFake) {
5454

@@ -67,9 +67,11 @@ private static int teleport(CommandContext<ServerCommandSource> context) {
6767
} else {
6868

6969
if (OptCarpetSettings.allowTpToRealPlayer.equals("true")) {
70+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + context.getSource().getName() + " to " + StringArgumentType.getString(context, "player"));
7071
server.getCommandManager().execute(server.getCommandSource(), "tp " + commandSourcePlayerName + " " + StringArgumentType.getString(context, "player"));
7172
} else if (OptCarpetSettings.allowTpToRealPlayer.equals("ops")) {
7273
if ((server.getPlayerManager().isOperator(context.getSource().getPlayer().getGameProfile()))) {
74+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + context.getSource().getName() + " to " + StringArgumentType.getString(context, "player"));
7375
server.getCommandManager().execute(server.getCommandSource(), "tp " + commandSourcePlayerName + " " + StringArgumentType.getString(context, "player"));
7476
} else {
7577
Messenger.m(context.getSource(), "r You have no permission to teleport to real player.You aren't op.");
@@ -105,7 +107,7 @@ private static int teleportHere(CommandContext<ServerCommandSource> context) {
105107
try {
106108
final String commandSourcePlayerName = context.getSource().getPlayer().getGameProfile().getName();
107109

108-
CarpetSettings.LOG.info("[OptCarpetAddition] " + commandSourcePlayerName + " submit command: /player " + StringArgumentType.getString(context, COMMAND_PREFIX) + " tphere");
110+
CarpetSettings.LOG.info("[OptCarpetAddition] " + commandSourcePlayerName + " submit command: player " + StringArgumentType.getString(context, COMMAND_PREFIX) + " tphere");
109111

110112
if (server.getPlayerManager().getPlayer(StringArgumentType.getString(context, COMMAND_PREFIX)) instanceof EntityPlayerMPFake) {
111113

@@ -124,9 +126,11 @@ private static int teleportHere(CommandContext<ServerCommandSource> context) {
124126
} else {
125127

126128
if (OptCarpetSettings.allowTpHereRealPlayer.equals("true")) {
129+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + StringArgumentType.getString(context, "player") + " to " + context.getSource().getName());
127130
server.getCommandManager().execute(server.getCommandSource(), "tp " + StringArgumentType.getString(context, COMMAND_PREFIX) + " " + commandSourcePlayerName);
128131
} else if (OptCarpetSettings.allowTpHereRealPlayer.equals("ops")) {
129132
if ((server.getPlayerManager().isOperator(context.getSource().getPlayer().getGameProfile()))) {
133+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + StringArgumentType.getString(context, "player") + " to " + context.getSource().getName());
130134
server.getCommandManager().execute(server.getCommandSource(), "tp " + StringArgumentType.getString(context, COMMAND_PREFIX) + " " + commandSourcePlayerName);
131135
} else {
132136
Messenger.m(context.getSource(), "r You have no permission to teleport here real player.You aren't op.");
@@ -147,10 +151,13 @@ private static int teleportHere(CommandContext<ServerCommandSource> context) {
147151

148152
private static void executeTp(String commandSourcePlayerName, CommandContext<ServerCommandSource> context, MinecraftServer server) {
149153
if (OptCarpetSettings.enableTpPrefixWhitelist && checkTpWhitelist(StringArgumentType.getString(context, "player"))) {
154+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + context.getSource().getName() + " to " + StringArgumentType.getString(context, "player"));
150155
server.getCommandManager().execute(server.getCommandSource(), "tp " + commandSourcePlayerName + " " + StringArgumentType.getString(context, "player"));
151156
} else if (OptCarpetSettings.enableTpPrefixBlacklist && checkTpBlacklist(StringArgumentType.getString(context, "player"))) {
157+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + context.getSource().getName() + " to " + StringArgumentType.getString(context, "player"));
152158
server.getCommandManager().execute(server.getCommandSource(), "tp " + commandSourcePlayerName + " " + StringArgumentType.getString(context, "player"));
153159
} else if (!OptCarpetSettings.enableTpPrefixBlacklist && !OptCarpetSettings.enableTpPrefixWhitelist) {
160+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + context.getSource().getName() + " to " + StringArgumentType.getString(context, "player"));
154161
server.getCommandManager().execute(server.getCommandSource(), "tp " + commandSourcePlayerName + " " + StringArgumentType.getString(context, "player"));
155162
} else {
156163
Messenger.m(context.getSource(), "r You can't tp to this player because of tp limit.");
@@ -159,10 +166,13 @@ private static void executeTp(String commandSourcePlayerName, CommandContext<Ser
159166

160167
private static void executeTpHere(String commandSourcePlayerName, CommandContext<ServerCommandSource> context, MinecraftServer server) {
161168
if (OptCarpetSettings.enableTpHerePrefixWhitelist && checkTpHereWhitelist(StringArgumentType.getString(context, "player"))) {
169+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + StringArgumentType.getString(context, "player") + " to " + context.getSource().getName());
162170
server.getCommandManager().execute(server.getCommandSource(), "tp " + StringArgumentType.getString(context, "player") + " " + commandSourcePlayerName);
163171
} else if (OptCarpetSettings.enableTpHerePrefixBlacklist && checkTpHereBlacklist(StringArgumentType.getString(context, "player"))) {
172+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + StringArgumentType.getString(context, "player") + " to " + context.getSource().getName());
164173
server.getCommandManager().execute(server.getCommandSource(), "tp " + StringArgumentType.getString(context, "player") + " " + commandSourcePlayerName);
165174
} else if (!OptCarpetSettings.enableTpHerePrefixBlacklist && !OptCarpetSettings.enableTpHerePrefixWhitelist) {
175+
server.getCommandManager().execute(server.getCommandSource(), "tell @a Teleport " + StringArgumentType.getString(context, "player") + " to " + context.getSource().getName());
166176
server.getCommandManager().execute(server.getCommandSource(), "tp " + StringArgumentType.getString(context, "player") + " " + commandSourcePlayerName);
167177
} else {
168178
Messenger.m(context.getSource(), "r You can't tp here this player because of tp limit.");

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"schemaVersion": 1,
33
"id": "opt-carpet-addition",
4-
"version": "${version}",
4+
"version": "1.2",
55
"name": "Opt-Carpet-Addition",
66
"description": "An extension mod of fabric-carpet.",
77
"authors": [

0 commit comments

Comments
 (0)