Merge pull request #7577 from HrafnaValkyrja/fix/spawner-delay-roundtrip

The save round trip no longer depends on where the player lands

tools/save_roundtrip_scene.py

@@ -59,10 +59,18 @@ FULL = [
     ('creeper_head', ''),
     ('oak_sign', f'{{front_text:{SIGN_SIDE},back_text:{{messages:["a","b","c","d"],color:"black",has_glowing_text:0b}},is_waxed:1b}}'),
     ('oak_hanging_sign', f'{{front_text:{SIGN_SIDE}}}'),
+    # RequiredPlayerRange 0: a spawner ticks its Delay down only while a player is within
+    # that range, and each game puts its player at a random spot near the world spawn,
+    # which can be 16 blocks from this one (vanilla 20 in one run, Horizon 10 in another).
+    # With range 0 nobody is ever near it, so the Delay is the same in every run.
     ('spawner', '{SpawnData:{entity:{id:"minecraft:pig"}},Delay:20s,MinSpawnDelay:200s,MaxSpawnDelay:800s,'
-                'SpawnCount:4s,MaxNearbyEntities:6s,RequiredPlayerRange:16s,SpawnRange:4s}'),
-    ('trial_spawner', '{required_player_range:10,target_cooldown_length:1200}'),
-    ('vault', '{config:{loot_table:"minecraft:chests/trial_chambers/reward",key_item:{id:"minecraft:trial_key",count:1}},'
+                'SpawnCount:4s,MaxNearbyEntities:6s,RequiredPlayerRange:0s,SpawnRange:4s}'),
+    # Also range-limited to players (10 by default): kept small for the same reason.
+    ('trial_spawner', '{required_player_range:1,target_cooldown_length:1200}'),
+    # Same reason as the spawner: a vault turns active (and shows its item) when a player is
+    # within activation_range (default 4), and a player can land that close.
+    ('vault', '{config:{loot_table:"minecraft:chests/trial_chambers/reward",key_item:{id:"minecraft:trial_key",count:1},'
+              'activation_range:1,deactivation_range:2},'
               'server_data:{rewarded_players:[[I;1,2,3,4]],total_ejections_needed:2}}'),
     ('command_block', f'{{Command:"say hi",auto:1b,TrackOutput:0b,{NAME}}}'),
     ('chain_command_block', '{Command:"say chain",conditionMet:1b}'),