keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fixed informational /forge commands being repeated to all ops when logging is enabled. Closes #6330

This commit is contained in:
Jamie Mansfield 2020-05-06 21:49:15 +01:00 committed by GitHub
parent 766019e1fc
commit fa01ba3221
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraftforge/server/command/CommandDimensions.java
View File

@ -47,7 +47,7 @@ public class CommandDimensions
} }
types.keySet().stream().sorted().forEach(key -> { types.keySet().stream().sorted().forEach(key -> {
ctx.getSource().sendFeedback(new StringTextComponent(key + ": " + types.get(key).stream().sorted().collect(Collectors.joining(", "))), true); ctx.getSource().sendFeedback(new StringTextComponent(key + ": " + types.get(key).stream().sorted().collect(Collectors.joining(", "))), false);
}); });
return 0; return 0;
}); });

10
src/main/java/net/minecraftforge/server/command/CommandEntity.java
View File

@ -68,7 +68,7 @@ class CommandEntity
return Commands.literal("list") return Commands.literal("list")
.requires(cs->cs.hasPermissionLevel(2)) //permission .requires(cs->cs.hasPermissionLevel(2)) //permission
.then(Commands.argument("filter", StringArgumentType.string()) .then(Commands.argument("filter", StringArgumentType.string())
.suggests((ctx, builder) -> ISuggestionProvider.suggest(ForgeRegistries.ENTITIES.getKeys().stream().map(id -> id.toString()), builder)) .suggests((ctx, builder) -> ISuggestionProvider.suggest(ForgeRegistries.ENTITIES.getKeys().stream().map(ResourceLocation::toString), builder))
.then(Commands.argument("dim", DimensionArgument.getDimension()) .then(Commands.argument("dim", DimensionArgument.getDimension())
.executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), DimensionArgument.getDimensionArgument(ctx, "dim"))) .executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), DimensionArgument.getDimensionArgument(ctx, "dim")))
) )
@ -105,7 +105,7 @@ class CommandEntity
if (info == null) if (info == null)
throw NO_ENTITIES.create(); throw NO_ENTITIES.create();
sender.sendFeedback(new TranslationTextComponent("commands.forge.entity.list.single.header", name, info.getLeft()), true); sender.sendFeedback(new TranslationTextComponent("commands.forge.entity.list.single.header", name, info.getLeft()), false);
List<Map.Entry<ChunkPos, Integer>> toSort = new ArrayList<>(); List<Map.Entry<ChunkPos, Integer>> toSort = new ArrayList<>();
toSort.addAll(info.getRight().entrySet()); toSort.addAll(info.getRight().entrySet());
toSort.sort((a, b) -> { toSort.sort((a, b) -> {
@ -119,7 +119,7 @@ class CommandEntity
for (Map.Entry<ChunkPos, Integer> e : toSort) for (Map.Entry<ChunkPos, Integer> e : toSort)
{ {
if (limit-- == 0) break; if (limit-- == 0) break;
sender.sendFeedback(new StringTextComponent(" " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z), true); sender.sendFeedback(new StringTextComponent(" " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z), false);
} }
return toSort.size(); return toSort.size();
} }
@ -145,8 +145,8 @@ class CommandEntity
throw NO_ENTITIES.create(); throw NO_ENTITIES.create();
int count = info.stream().mapToInt(Pair::getRight).sum(); int count = info.stream().mapToInt(Pair::getRight).sum();
sender.sendFeedback(new TranslationTextComponent("commands.forge.entity.list.multiple.header", count), true); sender.sendFeedback(new TranslationTextComponent("commands.forge.entity.list.multiple.header", count), false);
info.forEach(e -> sender.sendFeedback(new StringTextComponent(" " + e.getValue() + ": " + e.getKey()), true)); info.forEach(e -> sender.sendFeedback(new StringTextComponent(" " + e.getValue() + ": " + e.getKey()), false));
return info.size(); return info.size();
} }
} }

2
src/main/java/net/minecraftforge/server/command/CommandModList.java
View File

@ -45,7 +45,7 @@ public class CommandModList {
modFile.getModInfos().get(0).getVersion(), modFile.getModInfos().get(0).getVersion(),
modFile.getModInfos().size())). modFile.getModInfos().size())).
collect(Collectors.joining("\n• ","• ", ""))), collect(Collectors.joining("\n• ","• ", ""))),
true); false);
return 0; return 0;
} }
); );

6
src/main/java/net/minecraftforge/server/command/CommandTps.java
View File

@ -46,7 +46,7 @@ class CommandTps
double meanTickTime = mean(ctx.getSource().getServer().tickTimeArray) * 1.0E-6D; double meanTickTime = mean(ctx.getSource().getServer().tickTimeArray) * 1.0E-6D;
double meanTPS = Math.min(1000.0/meanTickTime, 20); double meanTPS = Math.min(1000.0/meanTickTime, 20);
ctx.getSource().sendFeedback(new TranslationTextComponent("commands.forge.tps.summary.all", TIME_FORMATTER.format(meanTickTime), TIME_FORMATTER.format(meanTPS)), true); ctx.getSource().sendFeedback(new TranslationTextComponent("commands.forge.tps.summary.all", TIME_FORMATTER.format(meanTickTime), TIME_FORMATTER.format(meanTPS)), false);
return 0; return 0;
} }
@ -57,12 +57,12 @@ class CommandTps
{ {
long[] times = cs.getServer().getTickTime(dim); long[] times = cs.getServer().getTickTime(dim);
if (times == null) /// Null means the world is unloaded. Not invalid. That's taken car of by DimensionArgument itself. if (times == null) // Null means the world is unloaded. Not invalid. That's taken car of by DimensionArgument itself.
times = UNLOADED; times = UNLOADED;
double worldTickTime = mean(times) * 1.0E-6D; double worldTickTime = mean(times) * 1.0E-6D;
double worldTPS = Math.min(1000.0 / worldTickTime, 20); double worldTPS = Math.min(1000.0 / worldTickTime, 20);
cs.sendFeedback(new TranslationTextComponent("commands.forge.tps.summary.named", dim.getId(), DimensionType.getKey(dim), TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), true); cs.sendFeedback(new TranslationTextComponent("commands.forge.tps.summary.named", dim.getId(), DimensionType.getKey(dim), TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), false);
return 1; return 1;
} }