2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 21 Jul 2018 14:27:34 -0400
|
|
|
|
Subject: [PATCH] Duplicate UUID Resolve Option
|
|
|
|
|
|
|
|
Due to a bug in https://github.com/PaperMC/Paper/commit/2e29af3df05ec0a383f48be549d1c03200756d24
|
|
|
|
which was added all the way back in March of 2016, it was unknown (potentially not at the time)
|
|
|
|
that an entity might actually change the seed of the random object.
|
|
|
|
|
|
|
|
At some point, EntitySquid did start setting the seed. Due to this shared random, this caused
|
|
|
|
every entity to use a Random object with a predictable seed.
|
|
|
|
|
|
|
|
This has caused entities to potentially generate with the same UUID....
|
|
|
|
|
|
|
|
Over the years, servers have had entities disappear, but no sign of trouble
|
|
|
|
because CraftBukkit removed the log lines indicating that something was wrong.
|
|
|
|
|
|
|
|
We have fixed the root issue causing duplicate UUID's, however we now have chunk
|
|
|
|
files full of entities that have the same UUID as another entity!
|
|
|
|
|
|
|
|
When these chunks load, the 2nd entity will not be added to the world correctly.
|
|
|
|
|
|
|
|
If that chunk loads in a different order in the future, then it will reverse and the
|
|
|
|
missing one is now the one added to the world and not the other. This results in very
|
|
|
|
inconsistent entity behavior.
|
|
|
|
|
|
|
|
This change allows you to recover any duplicate entity by generating a new UUID for it.
|
|
|
|
This also lets you delete them instead if you don't want to risk having new entities added to
|
|
|
|
the world that you previously did not see.
|
|
|
|
|
|
|
|
But for those who are ok with leaving this inconsistent behavior, you may use WARN or NOTHING options.
|
|
|
|
|
|
|
|
It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
index 9f8ee9d9b5fec9ca9c5e8462ed1aef742fa628ac..1b102f4c800dc6aa4e977c8ae8c9aada5d94e194 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
2024-01-24 22:13:08 +01:00
|
|
|
@@ -880,6 +880,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
2021-06-16 08:25:38 +02:00
|
|
|
entity.discard();
|
|
|
|
needsRemoval = true;
|
|
|
|
}
|
2024-01-21 12:53:04 +01:00
|
|
|
+ checkDupeUUID(world, entity); // Paper - duplicate uuid resolving
|
2021-06-16 08:25:38 +02:00
|
|
|
return !needsRemoval;
|
2024-01-24 13:07:40 +01:00
|
|
|
}));
|
2021-06-16 08:25:38 +02:00
|
|
|
// CraftBukkit end
|
2024-01-24 22:13:08 +01:00
|
|
|
@@ -930,6 +931,45 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
2024-01-24 13:07:40 +01:00
|
|
|
});
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2024-01-21 12:53:04 +01:00
|
|
|
+ // Paper start - duplicate uuid resolving
|
2022-09-01 18:51:59 +02:00
|
|
|
+ // rets true if to prevent the entity from being added
|
|
|
|
+ public static boolean checkDupeUUID(ServerLevel level, Entity entity) {
|
2022-06-09 10:51:45 +02:00
|
|
|
+ io.papermc.paper.configuration.WorldConfiguration.Entities.Spawning.DuplicateUUID.DuplicateUUIDMode mode = level.paperConfig().entities.spawning.duplicateUuid.mode;
|
|
|
|
+ if (mode != io.papermc.paper.configuration.WorldConfiguration.Entities.Spawning.DuplicateUUID.DuplicateUUIDMode.WARN
|
|
|
|
+ && mode != io.papermc.paper.configuration.WorldConfiguration.Entities.Spawning.DuplicateUUID.DuplicateUUIDMode.DELETE
|
|
|
|
+ && mode != io.papermc.paper.configuration.WorldConfiguration.Entities.Spawning.DuplicateUUID.DuplicateUUIDMode.SAFE_REGEN) {
|
2022-09-01 18:51:59 +02:00
|
|
|
+ return false;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ Entity other = level.getEntity(entity.getUUID());
|
|
|
|
+
|
2022-09-01 18:51:59 +02:00
|
|
|
+ if (other == null || other == entity) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+
|
2022-06-09 10:51:45 +02:00
|
|
|
+ if (mode == io.papermc.paper.configuration.WorldConfiguration.Entities.Spawning.DuplicateUUID.DuplicateUUIDMode.SAFE_REGEN && other != null && !other.isRemoved()
|
2021-06-16 08:25:38 +02:00
|
|
|
+ && Objects.equals(other.getEncodeId(), entity.getEncodeId())
|
2022-06-09 10:51:45 +02:00
|
|
|
+ && entity.getBukkitEntity().getLocation().distance(other.getBukkitEntity().getLocation()) < level.paperConfig().entities.spawning.duplicateUuid.safeRegenDeleteRange
|
2021-06-11 14:02:28 +02:00
|
|
|
+ ) {
|
2021-06-16 08:25:38 +02:00
|
|
|
+ entity.discard();
|
2022-09-01 18:51:59 +02:00
|
|
|
+ return true;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2024-01-21 17:39:05 +01:00
|
|
|
+ if (!other.isRemoved()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ switch (mode) {
|
|
|
|
+ case SAFE_REGEN: {
|
2022-07-27 21:49:24 +02:00
|
|
|
+ entity.setUUID(java.util.UUID.randomUUID());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ case DELETE: {
|
2021-06-16 08:25:38 +02:00
|
|
|
+ entity.discard();
|
2022-09-01 18:51:59 +02:00
|
|
|
+ return true;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ default:
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
2022-09-01 18:51:59 +02:00
|
|
|
+ return false;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2024-01-21 12:53:04 +01:00
|
|
|
+ // Paper end - duplicate uuid resolving
|
2021-06-16 08:25:38 +02:00
|
|
|
public CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> prepareTickingChunk(ChunkHolder holder) {
|
2024-01-24 13:07:40 +01:00
|
|
|
CompletableFuture<Either<List<ChunkAccess>, ChunkHolder.ChunkLoadingFailure>> completablefuture = this.getChunkRangeFuture(holder, 1, (i) -> {
|
|
|
|
return ChunkStatus.FULL;
|