aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0654-More-Lidded-Block-API.patch
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2022-09-26 01:02:51 -0700
committerGitHub <[email protected]>2022-09-26 01:02:51 -0700
commit01a13871deefa50e186a10b63f71c5e0459e7d30 (patch)
treecaf7056fa3ad155645b2dec6046b13841eb5d4a2 /patches/server/0654-More-Lidded-Block-API.patch
parentabe53a7eb477664aba5f32ff22d81f11ed48a44d (diff)
downloadPaper-01a13871deefa50e186a10b63f71c5e0459e7d30.tar.gz
Paper-01a13871deefa50e186a10b63f71c5e0459e7d30.zip
Rewrite chunk system (#8177)
Patch documentation to come Issues with the old system that are fixed now: - World generation does not scale with cpu cores effectively. - Relies on the main thread for scheduling and maintaining chunk state, dropping chunk load/generate rates at lower tps. - Unreliable prioritisation of chunk gen/load calls that block the main thread. - Shutdown logic is utterly unreliable, as it has to wait for all chunks to unload - is it guaranteed that the chunk system is in a state on shutdown that it can reliably do this? Watchdog shutdown also typically failed due to thread checks, which is now resolved. - Saving of data is not unified (i.e can save chunk data without saving entity data, poses problems for desync if shutdown is really abnormal. - Entities are not loaded with chunks. This caused quite a bit of headache for Chunk#getEntities API, but now the new chunk system loads entities with chunks so that they are ready whenever the chunk loads in. Effectively brings the behavior back to 1.16 era, but still storing entities in their own separate regionfiles. The above list is not complete. The patch documentation will complete it. New chunk system hard relies on starlight and dataconverter, and most importantly the new concurrent utilities in ConcurrentUtil. Some of the old async chunk i/o interface (i.e the old file io thread reroutes _some_ calls to the new file io thread) is kept for plugin compat reasons. It will be removed in the next major version of minecraft. The old legacy chunk system patches have been moved to the removed folder in case we need them again.
Diffstat (limited to 'patches/server/0654-More-Lidded-Block-API.patch')
-rw-r--r--patches/server/0654-More-Lidded-Block-API.patch75
1 files changed, 0 insertions, 75 deletions
diff --git a/patches/server/0654-More-Lidded-Block-API.patch b/patches/server/0654-More-Lidded-Block-API.patch
deleted file mode 100644
index 135fd68698..0000000000
--- a/patches/server/0654-More-Lidded-Block-API.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LemonCaramel <[email protected]>
-Date: Sun, 23 May 2021 17:49:51 +0900
-Subject: [PATCH] More Lidded Block API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
-index 9d0c272b1d89a96b0b63603fa8e4649f11fb6c51..d5fdf4504a0ca76fb0483f4ae5861c93fb622b2d 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
-@@ -58,4 +58,11 @@ public class CraftBarrel extends CraftLootable<BarrelBlockEntity> implements Bar
- }
- getTileEntity().openersCounter.opened = false;
- }
-+
-+ // Paper start - More Lidded Block API
-+ @Override
-+ public boolean isOpen() {
-+ return getTileEntity().openersCounter.opened;
-+ }
-+ // Paper end - More Lidded Block API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 82b3f3b3aced73ce136b6b94fe212972ac6090ef..b4bc5cbb71007b4d1a27bb841ff787a95e9ecbdc 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-@@ -78,4 +78,11 @@ public class CraftChest extends CraftLootable<ChestBlockEntity> implements Chest
- }
- getTileEntity().openersCounter.opened = false;
- }
-+
-+ // Paper start - More Lidded Block API
-+ @Override
-+ public boolean isOpen() {
-+ return getTileEntity().openersCounter.opened;
-+ }
-+ // Paper end - More Lidded Block API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
-index 6513acb46591b2903d1baf18c23ed1fc8c2a731f..b8ab67fd1820613520203f708f2f267587ace67b 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
-@@ -36,4 +36,11 @@ public class CraftEnderChest extends CraftBlockEntityState<EnderChestBlockEntity
- }
- getTileEntity().openersCounter.opened = false;
- }
-+
-+ // Paper start - More Lidded Block API
-+ @Override
-+ public boolean isOpen() {
-+ return getTileEntity().openersCounter.opened;
-+ }
-+ // Paper end - More Lidded Block API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-index 2d5205a9adfa66545f40a13bf0e37dc62ac0fdb9..72074b4c0feea8136e80589345538552ce28a2ea 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-@@ -55,8 +55,15 @@ public class CraftShulkerBox extends CraftLootable<ShulkerBoxBlockEntity> implem
- if (getTileEntity().opened && getWorldHandle() instanceof net.minecraft.world.level.Level) {
- net.minecraft.world.level.Level world = getTileEntity().getLevel();
- world.blockEvent(getPosition(), getTileEntity().getBlockState().getBlock(), 1, 0);
-- world.playSound(null, getPosition(), SoundEvents.SHULKER_BOX_OPEN, SoundSource.BLOCKS, 0.5F, world.random.nextFloat() * 0.1F + 0.9F);
-+ world.playSound(null, getPosition(), SoundEvents.SHULKER_BOX_CLOSE, SoundSource.BLOCKS, 0.5F, world.random.nextFloat() * 0.1F + 0.9F); // Paper - More Lidded Block API (Wrong sound)
- }
- getTileEntity().opened = false;
- }
-+
-+ // Paper start - More Lidded Block API
-+ @Override
-+ public boolean isOpen() {
-+ return getTileEntity().opened;
-+ }
-+ // Paper end - More Lidded Block API
- }