mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 23:09:26 +00:00
ae65be4b29
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@85e34e5 Updated Upstream (Paper) PurpurMC/Purpur@ff80cf5 Updated Upstream (Paper)
46 lines
2.6 KiB
Diff
46 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Fri, 31 Mar 2023 00:39:40 +0300
|
|
Subject: [PATCH] Fix entity serialization
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index 067302709a2291274eeecd1e4e04662b6914da12..8ab1cfdf1a108a968ff81ce6ed08f9bc27ee7cd4 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -2297,15 +2297,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
|
}
|
|
}
|
|
|
|
- // Paper start - Entity serialization api
|
|
- public boolean serializeEntity(CompoundTag compound) {
|
|
- List<Entity> pass = new java.util.ArrayList<>(this.getPassengers());
|
|
- this.passengers = ImmutableList.of();
|
|
- boolean result = save(compound);
|
|
- this.passengers = ImmutableList.copyOf(pass);
|
|
- return result;
|
|
- }
|
|
- // Paper end
|
|
public boolean save(CompoundTag nbt) {
|
|
return this.isPassenger() ? false : this.saveAsPassenger(nbt);
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
index 61f3f9550f0e2e62515502ccc5e7b90178a5db47..285f6e0afdf11fd6195c18638f7367c466bcf8e6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
@@ -501,8 +501,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
|
Preconditions.checkNotNull(entity, "null cannot be serialized");
|
|
Preconditions.checkArgument(entity instanceof org.bukkit.craftbukkit.entity.CraftEntity, "only CraftEntities can be serialized");
|
|
|
|
+ net.minecraft.world.entity.Entity nmsEntity = ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle();
|
|
CompoundTag compound = new CompoundTag();
|
|
- ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().serializeEntity(compound);
|
|
+ compound.putString("id", net.minecraft.world.entity.EntityType.getKey(nmsEntity.getType()).toString());
|
|
+ List<net.minecraft.world.entity.Entity> pass = new java.util.ArrayList<>(nmsEntity.getPassengers());
|
|
+ nmsEntity.passengers = com.google.common.collect.ImmutableList.of();
|
|
+ nmsEntity.saveWithoutId(compound);
|
|
+ nmsEntity.passengers = com.google.common.collect.ImmutableList.copyOf(pass);
|
|
return serializeNbtToBytes(compound);
|
|
}
|
|
|