899bc53b79
Upstream has released updates that appears 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: f47abd88 SPIGOT-6242: Fix some file line endings de96535b SPIGOT-6234: enum classes don't serialize properly when implementing ConfigurationSerializable CraftBukkit Changes: 4475707d SPIGOT-6244: /spawnpoint ignores angle 8b3b096d SPIGOT-6242: Fix some file line endings 4b33c749 SPIGOT-6186: Canceling a CreatureSpawnEvent results in a "Unable to summon entity due to duplicate UUIDs" error 2b3ca726 SPIGOT-6236: Vehicle passenger portal cooldown does not change
25 Zeilen
1.4 KiB
Diff
25 Zeilen
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <spottedleaf@spottedleaf.dev>
|
|
Date: Fri, 7 Aug 2020 04:27:56 -0700
|
|
Subject: [PATCH] Retain block place order when capturing blockstates
|
|
|
|
Fixes twisted vines not connecting properly when grown via
|
|
bonemeal by a player.
|
|
|
|
In general, look at making this logic more robust (i.e properly handling
|
|
cases where a captured entry is overriden) - but for now this will do.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 18cddbcb8447c0c09f9aeb8aab40bdf4ea762b3e..d64d94b8c329ddce27151afc012ecfe26b5ee707 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -75,7 +75,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
|
public boolean captureBlockStates = false;
|
|
public boolean captureTreeGeneration = false;
|
|
public Map<BlockPosition, org.bukkit.craftbukkit.block.CraftBlockState> capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper
|
|
- public Map<BlockPosition, TileEntity> capturedTileEntities = new HashMap<>();
|
|
+ public Map<BlockPosition, TileEntity> capturedTileEntities = new java.util.LinkedHashMap<>(); // Paper
|
|
public List<EntityItem> captureDrops;
|
|
public long ticksPerAnimalSpawns;
|
|
public long ticksPerMonsterSpawns;
|