craftbukkit/nms-patches/net/minecraft/commands/arguments/blocks/ArgumentBlock.patch

39 lines
2 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/commands/arguments/blocks/ArgumentBlock.java
+++ b/net/minecraft/commands/arguments/blocks/ArgumentBlock.java
2021-06-11 15:00:00 +10:00
@@ -61,7 +61,7 @@
2020-06-25 10:00:00 +10:00
};
2021-06-11 15:00:00 +10:00
private final StringReader reader;
private final boolean forTesting;
- private final Map<IBlockState<?>, Comparable<?>> properties = Maps.newHashMap();
+ private final Map<IBlockState<?>, Comparable<?>> properties = Maps.newLinkedHashMap(); // CraftBukkit - stable
private final Map<String, String> vagueProperties = Maps.newHashMap();
private MinecraftKey id = new MinecraftKey("");
private BlockStateList<Block, IBlockData> definition;
2022-03-01 02:00:00 +11:00
@@ -230,7 +230,7 @@
2021-11-22 09:00:00 +11:00
Iterator iterator = iblockstate.getPossibleValues().iterator();
2018-12-26 08:00:00 +11:00
while (iterator.hasNext()) {
- T t0 = (Comparable) iterator.next();
+ T t0 = (T) iterator.next(); // CraftBukkit - decompile error
if (t0 instanceof Integer) {
suggestionsbuilder.suggest((Integer) t0);
2022-03-01 02:00:00 +11:00
@@ -493,7 +493,7 @@
2021-11-22 09:00:00 +11:00
Optional<T> optional = iblockstate.getValue(s);
if (optional.isPresent()) {
2021-11-22 09:00:00 +11:00
- this.state = (IBlockData) this.state.setValue(iblockstate, (Comparable) optional.get());
+ this.state = (IBlockData) this.state.setValue(iblockstate, (T) optional.get()); // CraftBukkit - decompile error
2021-06-11 15:00:00 +10:00
this.properties.put(iblockstate, (Comparable) optional.get());
} else {
2021-06-11 15:00:00 +10:00
this.reader.setCursor(i);
2022-03-01 02:00:00 +11:00
@@ -527,7 +527,7 @@
2021-11-22 09:00:00 +11:00
private static <T extends Comparable<T>> void appendProperty(StringBuilder stringbuilder, IBlockState<T> iblockstate, Comparable<?> comparable) {
2020-06-25 10:00:00 +10:00
stringbuilder.append(iblockstate.getName());
stringbuilder.append('=');
2021-11-22 09:00:00 +11:00
- stringbuilder.append(iblockstate.getName(comparable));
+ stringbuilder.append(iblockstate.getName((T) comparable)); // CraftBukkit - decompile error
}
2022-03-01 02:00:00 +11:00
public CompletableFuture<Suggestions> fillSuggestions(SuggestionsBuilder suggestionsbuilder, IRegistry<Block> iregistry) {