diff options
| author | Shane Freeder <[email protected]> | 2024-05-09 14:51:33 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2024-05-09 14:51:33 +0100 |
| commit | 3693bbdc6b65e68db10375d3eeab70f06708b729 (patch) | |
| tree | 4a71a5e6e5f50b3e2937053a5d4b4196ef67665b /patches/server/0976-Rewrite-dataconverter-system.patch | |
| parent | f2512b12385961f8ca1f69efebe5ed0e00c0caa8 (diff) | |
| download | Paper-3693bbdc6b65e68db10375d3eeab70f06708b729.tar.gz Paper-3693bbdc6b65e68db10375d3eeab70f06708b729.zip | |
Use internals for getting block/entity countstimings/use-internals
For a long time I've been meaning to move some of this logic internally
as this would allow us to avoid hitting systems like block state snapshots
which can create issues as many of the spigot implementations of this
stuff are increasingly broken, leading to unexpected crashes during ticking,
even if the API cannot properly interact with these such states/items,
it's generally more preferable to not crash the server in the course,
and just let those interactions fail more gracefully.
Diffstat (limited to 'patches/server/0976-Rewrite-dataconverter-system.patch')
| -rw-r--r-- | patches/server/0976-Rewrite-dataconverter-system.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0976-Rewrite-dataconverter-system.patch b/patches/server/0976-Rewrite-dataconverter-system.patch index 0abf2badef..c04db63ac1 100644 --- a/patches/server/0976-Rewrite-dataconverter-system.patch +++ b/patches/server/0976-Rewrite-dataconverter-system.patch @@ -22437,7 +22437,7 @@ index 0000000000000000000000000000000000000000..f50b81d931a1908d405bb72e0679983a +} diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java new file mode 100644 -index 0000000000000000000000000000000000000000..29d256c2f5d5e338dc7abeb82c0f1ae99ee1edf7 +index 0000000000000000000000000000000000000000..40f9b8f2a3d0b01dc97472f34c441321a0e33079 --- /dev/null +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java @@ -0,0 +1,339 @@ @@ -28906,10 +28906,10 @@ index 1d287dd7379e56f7fd4b425880b850cd843f5789..8ab7ca373a885fbe658013c9c6a2e38d return nbttagcompound; }); diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 4d66c0d64af800c92e84a40e90cda9c6a49d3f04..a1c9989df460d7ae3666fffe7968750832a30b85 100644 +index 4baf089a622ecf56cb9d2116f7974b0fabaaac38..d3dc93242336e9a68f9241b051fa32815d826185 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -525,7 +525,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -529,7 +529,7 @@ public final class CraftMagicNumbers implements UnsafeValues { net.minecraft.nbt.CompoundTag compound = deserializeNbtFromBytes(data); final int dataVersion = compound.getInt("DataVersion"); @@ -28918,7 +28918,7 @@ index 4d66c0d64af800c92e84a40e90cda9c6a49d3f04..a1c9989df460d7ae3666fffe79687508 return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.parse(MinecraftServer.getServer().registryAccess(), compound).orElseThrow()); } -@@ -546,7 +546,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -550,7 +550,7 @@ public final class CraftMagicNumbers implements UnsafeValues { net.minecraft.nbt.CompoundTag compound = deserializeNbtFromBytes(data); int dataVersion = compound.getInt("DataVersion"); |