Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-02 11:21:15 +01:00
Code Issues Projects Releases Wiki Activity

Simplify flow

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2022-04-12 14:14:36 +02:00
parent 6a79de2406
commit 86526ab219
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/tag/Tag.java
View File

@ -219,7 +219,7 @@ public class Tag<T> {
}
final T createDefault() {
final var supplier = defaultValue;
final Supplier<T> supplier = defaultValue;
return supplier != null ? supplier.get() : null;
}

18
src/main/java/net/minestom/server/tag/TagHandlerImpl.java
View File

@ -94,7 +94,7 @@ final class TagHandlerImpl implements TagHandler {
Entry<?>[] entries = this.entries;
final Entry<?>[] localEntries = entries;
final var paths = tag.path;
final Tag.PathEntry[] paths = tag.path;
TagHandlerImpl[] pathHandlers = null;
if (paths != null) {
final int length = paths.length;
@ -107,20 +107,14 @@ final class TagHandlerImpl implements TagHandler {
local.entries = entries = Arrays.copyOf(entries, pathIndex + 1);
}
final Entry<?> entry = entries[pathIndex];
if (entry == null) {
if (value == null) return;
// Empty path, create a new handler
local = new TagHandlerImpl();
entries[pathIndex] = new PathEntry(path.name(), local);
} else if (entry instanceof PathEntry pathEntry) {
if (entry instanceof PathEntry pathEntry) {
// Existing path, continue navigating
local = pathEntry.value;
} else {
// Probably is a Structure entry,
// convert it to nbt to allow mutation (and drop the cached object)
if (value == null) return;
final NBT nbt = entry.updatedNbt();
local = nbt instanceof NBTCompound compound ? fromCompound(compound) : new TagHandlerImpl();
// Empty path, create a new handler.
// Slow path is taken if the entry comes from a Structure tag, requiring conversion from NBT
local = entry != null && entry.updatedNbt() instanceof NBTCompound compound ? fromCompound(compound) : new TagHandlerImpl();
entries[pathIndex] = new PathEntry(path.name(), local);
}
entries = local.entries;
@ -203,7 +197,7 @@ final class TagHandlerImpl implements TagHandler {
}
}
static Entry<?>[] traversePath(Tag.PathEntry[] paths, Entry<?>[] entries) {
private static Entry<?>[] traversePath(Tag.PathEntry[] paths, Entry<?>[] entries) {
for (var path : paths) {
final int pathIndex = path.index();
final Entry<?> entry;