Revert "Make end tag singleton"

This reverts commit 13d2ae20
Why was this changed. I doubt it did much in terms of performance. It's better to stay as close as we can to the worldedit repo.
Dieser Commit ist enthalten in:
matt 2019-03-22 12:51:44 -04:00
Ursprung feaf848e26
Commit 456f821ce0
6 geänderte Dateien mit 661 neuen und 670 gelöschten Zeilen

Datei anzeigen

@ -440,7 +440,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
} else if (foreign instanceof NBTTagString) { } else if (foreign instanceof NBTTagString) {
return new StringTag(foreign.asString()); // data return new StringTag(foreign.asString()); // data
} else if (foreign instanceof NBTTagEnd) { } else if (foreign instanceof NBTTagEnd) {
return EndTag.INSTANCE; return new EndTag();
} else { } else {
throw new IllegalArgumentException("Don't know how to make native " + foreign.getClass().getCanonicalName()); throw new IllegalArgumentException("Don't know how to make native " + foreign.getClass().getCanonicalName());
} }

Datei anzeigen

@ -174,7 +174,7 @@ public class FaweCache {
if (clazz.getName().startsWith("com.intellectualcrafters.jnbt")) { if (clazz.getName().startsWith("com.intellectualcrafters.jnbt")) {
try { try {
if (clazz.getName().equals("com.intellectualcrafters.jnbt.EndTag")) { if (clazz.getName().equals("com.intellectualcrafters.jnbt.EndTag")) {
return EndTag.INSTANCE; return new EndTag();
} }
Field field = clazz.getDeclaredField("value"); Field field = clazz.getDeclaredField("value");
field.setAccessible(true); field.setAccessible(true);

Datei anzeigen

@ -9,24 +9,18 @@ import java.io.DataInput;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Function; import java.util.function.Function;
public class NBTStreamer { public class NBTStreamer {
private final NBTInputStream is; private final NBTInputStream is;
private final Map<String, BiConsumer> readers; private final HashMap<String, BiConsumer> readers;
public NBTStreamer(NBTInputStream stream) { public NBTStreamer(NBTInputStream stream) {
this.is = stream; this.is = stream;
readers = new HashMap<>(); readers = new HashMap<>();
} }
public NBTStreamer(NBTInputStream stream, Map<String, BiConsumer> readers) {
this.is = stream;
this.readers = readers;
}
/** /**
* Reads the entire stream and runs the applicable readers * Reads the entire stream and runs the applicable readers
* *

Datei anzeigen

@ -23,9 +23,6 @@ package com.sk89q.jnbt;
* The {@code TAG_End} tag. * The {@code TAG_End} tag.
*/ */
public final class EndTag extends Tag { public final class EndTag extends Tag {
public static final EndTag INSTANCE = new EndTag();
private EndTag() {}
@Override @Override
public Object getValue() { public Object getValue() {

Datei anzeigen

@ -532,7 +532,7 @@ public final class NBTInputStream implements Closeable {
throw new IOException( throw new IOException(
"TAG_End found without a TAG_Compound/TAG_List tag preceding it."); "TAG_End found without a TAG_Compound/TAG_List tag preceding it.");
} else { } else {
return EndTag.INSTANCE; return new EndTag();
} }
case NBTConstants.TYPE_BYTE: case NBTConstants.TYPE_BYTE:
return new ByteTag(is.readByte()); return new ByteTag(is.readByte());

Datei anzeigen

@ -217,7 +217,7 @@ final class NBTConverter {
} }
public static EndTag fromNative(NBTTagEnd other) { public static EndTag fromNative(NBTTagEnd other) {
return EndTag.INSTANCE; return new EndTag();
} }
public static LongTag fromNative(NBTTagLong other) { public static LongTag fromNative(NBTTagLong other) {