From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Aug 2020 12:53:36 -0500 Subject: [PATCH] Add no-random-tick block list diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java index d95e45c2867cf3232cebd4b4c43bd890bfb70847..750e1900204a1d8717ec78ab2a5863a464e84431 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -483,7 +483,7 @@ public class ServerLevel extends Level implements WorldGenLevel { this.players = Lists.newArrayList(); this.entityTickList = new EntityTickList(); Predicate predicate = (block) -> { // CraftBukkit - decompile eror - return block == null || block.defaultBlockState().isAir(); + return block == null || block.defaultBlockState().isAir() || purpurConfig.noRandomTickBlocks.contains(block); // Purpur }; DefaultedRegistry registryblocks = Registry.BLOCK; diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java index 4853025530de9c22bde9e54b81120102dae5477c..35887a72e8e5c1193fd5b484946512df128b25c1 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -915,10 +915,12 @@ public abstract class BlockBehaviour { } public void tick(ServerLevel world, BlockPos pos, Random random) { + if (world.purpurConfig.noRandomTickBlocks.contains(getBlock())) return; // Purpur this.getBlock().tick(this.asState(), world, pos, random); } public void randomTick(ServerLevel world, BlockPos pos, Random random) { + if (world.purpurConfig.noRandomTickBlocks.contains(getBlock())) return; // Purpur this.getBlock().randomTick(this.asState(), world, pos, random); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index 3f780ac884e8037d155d402ba9a6807afb0d7a16..d301176f1e755fbacc6b3145c0fe8f36a6764b7c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -293,6 +293,28 @@ public class PurpurWorldConfig { voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); } + public Set noRandomTickBlocks = new HashSet<>(); + private void noRandomTickBlocks() { + if (PurpurConfig.version < 11) { + List oldList = PurpurConfig.config.getStringList("world-settings." + worldName + ".blocks.no-tick"); + if (!oldList.isEmpty()) { + PurpurConfig.config.set("world-settings." + worldName + ".blocks.no-random-tick", oldList); + PurpurConfig.config.set("world-settings." + worldName + ".blocks.no-tick", null); + } + oldList = PurpurConfig.config.getStringList("world-settings.default.blocks.no-tick"); + if (!oldList.isEmpty()) { + PurpurConfig.config.set("world-settings.default.blocks.no-random-tick", oldList); + PurpurConfig.config.set("world-settings.default.blocks.no-tick", null); + } + } + getList("blocks.no-random-tick", new ArrayList<>()).forEach(key -> { + Block block = Registry.BLOCK.get(new ResourceLocation(key.toString())); + if (!block.defaultBlockState().isAir()) { + noRandomTickBlocks.add(block); + } + }); + } + public boolean anvilAllowColors = false; private void anvilSettings() { anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors);