Skip to content

Fix queue serialisation. #7455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Moderocky merged 2 commits into from
Jan 25, 2025
Merged

Fix queue serialisation. #7455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdda266
Fix Queue serialisation.
Moderocky Jan 16, 2025
dd64f51
Merge branch 'dev/patch' into fix-it-duck
Moderocky Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 48 additions & 2 deletions src/main/java/ch/njol/skript/classes/data/SkriptClasses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,21 @@
import ch.njol.skript.util.visual.VisualEffect;
import ch.njol.skript.util.visual.VisualEffects;
import ch.njol.yggdrasil.Fields;
import org.skriptlang.skript.lang.util.SkriptQueue;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.lang.script.Script;
import org.skriptlang.skript.lang.util.SkriptQueue;
import org.skriptlang.skript.util.Executable;

import java.io.File;
import java.io.NotSerializableException;
import java.io.StreamCorruptedException;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -731,7 +733,51 @@ public void change(SkriptQueue[] what, Object @Nullable [] delta, ChangeMode mod
}
}
})
.serializer(new YggdrasilSerializer<>())
.parser(new Parser<SkriptQueue>() {

@Override
public boolean canParse(ParseContext context) {
return false;
}

@Override
public String toString(SkriptQueue queue, int flags) {
return Classes.toString(queue.toArray(), flags, true);
}

@Override
public String toVariableNameString(SkriptQueue queue) {
return this.toString(queue, 0);
}

})
.serializer(new Serializer<SkriptQueue>() {
@Override
public Fields serialize(SkriptQueue queue) throws NotSerializableException {
Fields fields = new Fields();
fields.putObject("contents", queue.toArray());
return fields;
}

@Override
public void deserialize(SkriptQueue queue, Fields fields)
throws StreamCorruptedException, NotSerializableException {
Object[] contents = fields.getObject("contents", Object[].class);
queue.clear();
if (contents != null)
queue.addAll(List.of(contents));
}

@Override
public boolean mustSyncDeserialization() {
return false;
}

@Override
protected boolean canBeInstantiated() {
return true;
}
})
);


Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/skriptlang/skript/lang/util/SkriptQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import ch.njol.skript.lang.util.common.AnyAmount;
import ch.njol.skript.util.Container;
import ch.njol.yggdrasil.YggdrasilSerializable;
import org.jetbrains.annotations.NotNull;

import java.util.*;
Expand All @@ -13,7 +12,7 @@
*/
@Container.ContainerType(Object.class)
public class SkriptQueue extends LinkedList<@NotNull Object>
implements Deque<Object>, Queue<Object>, YggdrasilSerializable, AnyAmount, Container<Object> {
implements Deque<Object>, Queue<Object>, AnyAmount, Container<Object> {

@Override
public boolean add(Object element) {
Expand Down