Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-02-16 11:51:58 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0

Browse Source
This commit is contained in:
Mike Primm 2020-09-20 18:55:59 -05:00
commit 1ab80de88e
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -24,11 +24,13 @@
/bin /bin
/dist /dist
/manifest.mf /manifest.mf
/run
# Mac filesystem dust # Mac filesystem dust
/.DS_Store /.DS_Store
/dependency-reduced-pom.xml /dependency-reduced-pom.xml
*.log
/.gradle /.gradle
/fabric-1.16.1_client.launch /fabric-1.16.1_client.launch
/fabric-1.16.1_server.launch /fabric-1.16.1_server.launch

4
DynmapCore/src/main/resources/texture_1.txt
View File

@ -565,8 +565,8 @@ block:id=dirt,allfaces=0:dirt,stdrot=true
# Coarse Dirt # Coarse Dirt
block:id=coarse_dirt,allfaces=0:coarse_dirt,stdrot=true block:id=coarse_dirt,allfaces=0:coarse_dirt,stdrot=true
# Pozdol # Pozdol
block:id=podzol,data=0,allsides=0:grass_block_snow,top=1000:grass_block_top,bottom=0:dirt,stdrot=true block:id=podzol,data=0,allsides=0:grass_block_snow,top=0:grass_block_top,bottom=0:dirt,stdrot=true
block:id=podzol,data=1,allsides=1000:podzol_side,top=1000:podzol_top,bottom=0:dirt,stdrot=true block:id=podzol,data=1,allsides=0:podzol_side,top=0:podzol_top,bottom=0:dirt,stdrot=true
# Cobblestone # Cobblestone
block:id=cobblestone,allfaces=0:cobblestone,stdrot=true block:id=cobblestone,allfaces=0:cobblestone,stdrot=true
# Wooden Plank (oak) # Wooden Plank (oak)

8
fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/command/DynmapCommandExecutor.java
View File

@ -45,7 +45,13 @@ public class DynmapCommandExecutor implements Command<ServerCommandSource> {
@Override @Override
public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException { public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
String[] args = context.getInput().split("\\s+"); // Commands in brigadier may be proxied in Minecraft via a syntax like `/execute ... ... run dmap [args]`
// Dynmap will fail to parse this properly, so we find the starting position of the actual command being parsed after any forks or redirects.
// The start position of the range specifies where the actual command dynmap has registered starts
int start = context.getRange().getStart();
String dynmapInput = context.getInput().substring(start);
String[] args = dynmapInput.split("\\s+");
plugin.handleCommand(context.getSource(), cmd, Arrays.copyOfRange(args, 1, args.length)); plugin.handleCommand(context.getSource(), cmd, Arrays.copyOfRange(args, 1, args.length));
return 1; return 1;
} }

8
fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/command/DynmapCommandExecutor.java
View File

@ -45,7 +45,13 @@ public class DynmapCommandExecutor implements Command<ServerCommandSource> {
@Override @Override
public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException { public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
String[] args = context.getInput().split("\\s+"); // Commands in brigadier may be proxied in Minecraft via a syntax like `/execute ... ... run dmap [args]`
// Dynmap will fail to parse this properly, so we find the starting position of the actual command being parsed after any forks or redirects.
// The start position of the range specifies where the actual command dynmap has registered starts
int start = context.getRange().getStart();
String dynmapInput = context.getInput().substring(start);
String[] args = dynmapInput.split("\\s+");
plugin.handleCommand(context.getSource(), cmd, Arrays.copyOfRange(args, 1, args.length)); plugin.handleCommand(context.getSource(), cmd, Arrays.copyOfRange(args, 1, args.length));
return 1; return 1;
} }