mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
17368d1aa9
Upstream has released updates that appear to apply and compile correctly Paper Changes: 12dec20 Bump paerweight to 1.1.7 e33ed89 Get short commit ref using a more proper method 7d6147d Remove now unneeded patch due to paperweight 1.1.7 e72fa41 Update task dependency for includeMappings so the new task isn't skipped 0ad5526 Trim whitspace off of git hash (oops) Tuinity Changes: e878ba9 Update paper 2bd2849 Bring back fix codec spam patch
70 lines
3.9 KiB
Diff
70 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
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 39402063a73fbdbefdbcd7b4f7ea675cafdfaa3a..edcc1c8ff972c94983193b0057a9d11875ecc0c6 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
@@ -488,7 +488,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
|
this.players = Lists.newArrayList();
|
|
this.entityTickList = new EntityTickList();
|
|
Predicate<Block> 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 7538262e14c86e4da9cd4cb887b76f649bfef2e6..f34973be478de4f088a0593b45bd89e558a13609 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 c0dd404357dade5ef61f6c20b143ec46543cfb51..6e53ebf9dbac0d1dc387845abe8d47abdf18b9f0 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -274,6 +274,28 @@ public class PurpurWorldConfig {
|
|
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
|
|
}
|
|
|
|
+ public Set<Block> noRandomTickBlocks = new HashSet<>();
|
|
+ private void noRandomTickBlocks() {
|
|
+ if (PurpurConfig.version < 11) {
|
|
+ List<String> 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);
|