Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add additional barriers

This commit is contained in:
themode 2022-03-03 12:13:25 +01:00
parent f7d44c4774
commit 708307dbde
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minestom/server/ServerProcessImpl.java
View File

@ -23,7 +23,10 @@ import net.minestom.server.network.PacketProcessor;
import net.minestom.server.network.socket.Server;
import net.minestom.server.recipe.RecipeManager;
import net.minestom.server.scoreboard.TeamManager;
import net.minestom.server.snapshot.*;
import net.minestom.server.snapshot.EntitySnapshot;
import net.minestom.server.snapshot.InstanceSnapshot;
import net.minestom.server.snapshot.ServerSnapshot;
import net.minestom.server.snapshot.SnapshotUpdater;
import net.minestom.server.terminal.MinestomTerminal;
import net.minestom.server.thread.Acquirable;
import net.minestom.server.thread.ThreadDispatcher;
@ -262,7 +265,7 @@ final class ServerProcessImpl implements ServerProcess {
}
@Override
public @NotNull Snapshot updateSnapshot(@NotNull SnapshotUpdater updater) {
public @NotNull ServerSnapshot updateSnapshot(@NotNull SnapshotUpdater updater) {
List<AtomicReference<InstanceSnapshot>> instanceRefs = new ArrayList<>();
Int2ObjectOpenHashMap<AtomicReference<EntitySnapshot>> entityRefs = new Int2ObjectOpenHashMap<>();
for (Instance instance : instance.getInstances()) {

4
src/main/java/net/minestom/server/snapshot/SnapshotUpdaterImpl.java
View File

@ -19,7 +19,7 @@ final class SnapshotUpdaterImpl implements SnapshotUpdater {
var updater = new SnapshotUpdaterImpl();
var ref = updater.reference(snapshotable);
updater.update();
return (T) ref.getPlain();
return (T) ref.get();
}
@Override
@ -44,7 +44,7 @@ final class SnapshotUpdaterImpl implements SnapshotUpdater {
queue = new ArrayList<>();
temp.parallelStream().forEach(entry -> {
Snapshotable snap = entry.snapshotable;
entry.ref.setPlain(Objects.requireNonNull(snap.updateSnapshot(this), "Snapshot must not be null after an update!"));
entry.ref.set(Objects.requireNonNull(snap.updateSnapshot(this), "Snapshot must not be null after an update!"));
});
}
}