mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
Updated Upstream (CraftBukkit)
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 CraftBukkit Changes:3f572834
#740: Fix EntityDamageEvent not being called for non EntityDamageSource for End Crystals3c7143e7
SPIGOT-5953, SPIGOT-5914: Use LinkedHashMap to keep captured block states in order
This commit is contained in:
parent
a16b50072f
commit
8dad068601
2 changed files with 3 additions and 3 deletions
|
@ -25,8 +25,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
|
||||
public boolean captureBlockStates = false;
|
||||
public boolean captureTreeGeneration = false;
|
||||
- public Map<BlockPosition, CapturedBlockState> capturedBlockStates = new HashMap<>();
|
||||
+ public Map<BlockPosition, org.bukkit.craftbukkit.block.CraftBlockState> capturedBlockStates = new HashMap<>(); // Paper
|
||||
- public Map<BlockPosition, CapturedBlockState> capturedBlockStates = new java.util.LinkedHashMap<>();
|
||||
+ public Map<BlockPosition, org.bukkit.craftbukkit.block.CraftBlockState> capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper
|
||||
public Map<BlockPosition, TileEntity> capturedTileEntities = new HashMap<>();
|
||||
public List<EntityItem> captureDrops;
|
||||
public long ticksPerAnimalSpawns;
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 7d31adb5f7e871581044fc8547eb723f4fad6a5d
|
||||
Subproject commit 3f572834a632e841cb3fd5db400130097a990c7a
|
Loading…
Reference in a new issue