mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 23:09:34 +00:00
152 lines
9.0 KiB
Diff
152 lines
9.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Fri, 7 Jul 2023 21:27:24 +0800
|
|
Subject: [PATCH] No block update command
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
index 0f3a92155fa0b4ed9d7fbc87202fd04dc01a0890..3bb53128f6919712f0a88ec11c1bce25bf5b8b84 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
@@ -2464,6 +2464,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
|
|
|
@Override
|
|
public void blockUpdated(BlockPos pos, Block block) {
|
|
+ if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
|
|
if (!this.isDebug()) {
|
|
// CraftBukkit start
|
|
if (this.populating) {
|
|
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
index 600f9d29e5b81a69a0f3a97ec93b37ad4f72b51c..f33088fa895e36dcaf6e96c52aacd5545b657a5a 100644
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
@@ -506,7 +506,7 @@ public final class ItemStack implements DataComponentHolder {
|
|
net.minecraft.world.level.block.state.BlockState block = world.getBlockState(newblockposition);
|
|
|
|
if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
|
|
- block.onPlace(world, newblockposition, oldBlock, true, context); // Paper - pass context
|
|
+ if (!org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) block.onPlace(world, newblockposition, oldBlock, true, context); // Paper - pass context // Leaves - no block update
|
|
}
|
|
|
|
world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
|
index f94ca04e55e02f2d8fcb98ad1868319d55da7468..11fadf105e59b4cddc8c4fa4f02b1ce69abfc7c7 100644
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
|
@@ -481,7 +481,7 @@ public class LevelChunk extends ChunkAccess {
|
|
} else {
|
|
// CraftBukkit - Don't place while processing the BlockPlaceEvent, unless it's a BlockContainer. Prevents blocks such as TNT from activating when cancelled.
|
|
if (!this.level.isClientSide && doPlace && (!this.level.captureBlockStates || block instanceof net.minecraft.world.level.block.BaseEntityBlock)) {
|
|
- iblockdata.onPlace(this.level, blockposition, iblockdata1, flag);
|
|
+ if (!org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) iblockdata.onPlace(this.level, blockposition, iblockdata1, flag); // Leaves - no block update
|
|
}
|
|
|
|
if (iblockdata.hasBlockEntity()) {
|
|
diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
|
|
index d5352883ee51dfc646352ae7e2b76af7efd0441e..57f952323639c1ce409032b8023a7911b4fee9b2 100644
|
|
--- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
|
|
+++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
|
|
@@ -518,6 +518,7 @@ public abstract class FlowingFluid extends Fluid {
|
|
|
|
@Override
|
|
public void tick(Level world, BlockPos pos, FluidState state) {
|
|
+ if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
|
|
if (!state.isSource()) {
|
|
FluidState fluid1 = this.getNewLiquid(world, pos, world.getBlockState(pos));
|
|
int i = this.getSpreadDelay(world, pos, state, fluid1);
|
|
diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
|
|
index 106af2b2c7ff72c7549975aef75cdcff8d9a7d97..ef9f2552367dfa8b708f18d66a4526fea8c24807 100644
|
|
--- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
|
|
+++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
|
|
@@ -48,6 +48,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
|
|
}
|
|
|
|
private void addAndRun(BlockPos pos, CollectingNeighborUpdater.NeighborUpdates entry) {
|
|
+ if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
|
|
boolean bl = this.count > 0;
|
|
boolean bl2 = this.maxChainedNeighborUpdates >= 0 && this.count >= this.maxChainedNeighborUpdates;
|
|
this.count++;
|
|
diff --git a/src/main/java/net/minecraft/world/level/redstone/InstantNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/InstantNeighborUpdater.java
|
|
index 2708251ebc1995e71fb0e5dca9e158a3005f8a8a..2c39d07e5612b3d435fb782d7861448c470950b4 100644
|
|
--- a/src/main/java/net/minecraft/world/level/redstone/InstantNeighborUpdater.java
|
|
+++ b/src/main/java/net/minecraft/world/level/redstone/InstantNeighborUpdater.java
|
|
@@ -15,17 +15,20 @@ public class InstantNeighborUpdater implements NeighborUpdater {
|
|
|
|
@Override
|
|
public void shapeUpdate(Direction direction, BlockState neighborState, BlockPos pos, BlockPos neighborPos, int flags, int maxUpdateDepth) {
|
|
+ if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
|
|
NeighborUpdater.executeShapeUpdate(this.level, direction, neighborState, pos, neighborPos, flags, maxUpdateDepth - 1);
|
|
}
|
|
|
|
@Override
|
|
public void neighborChanged(BlockPos pos, Block sourceBlock, BlockPos sourcePos) {
|
|
+ if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
|
|
BlockState blockState = this.level.getBlockState(pos);
|
|
this.neighborChanged(blockState, pos, sourceBlock, sourcePos, false);
|
|
}
|
|
|
|
@Override
|
|
public void neighborChanged(BlockState state, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) {
|
|
+ if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
|
|
NeighborUpdater.executeUpdate(this.level, state, pos, sourceBlock, sourcePos, notify);
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/leavesmc/leaves/command/NoBlockUpdateCommand.java b/src/main/java/org/leavesmc/leaves/command/NoBlockUpdateCommand.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..f60f3409aeb72f8f0195e667ccb139a7f81729b6
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/leavesmc/leaves/command/NoBlockUpdateCommand.java
|
|
@@ -0,0 +1,52 @@
|
|
+package org.leavesmc.leaves.command;
|
|
+
|
|
+import net.kyori.adventure.text.Component;
|
|
+import net.kyori.adventure.text.JoinConfiguration;
|
|
+import net.kyori.adventure.text.format.NamedTextColor;
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.command.Command;
|
|
+import org.bukkit.command.CommandSender;
|
|
+import org.bukkit.permissions.Permission;
|
|
+import org.bukkit.permissions.PermissionDefault;
|
|
+import org.bukkit.plugin.PluginManager;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.leavesmc.leaves.LeavesConfig;
|
|
+
|
|
+import java.util.List;
|
|
+
|
|
+public class NoBlockUpdateCommand extends Command {
|
|
+
|
|
+ private static boolean noBlockUpdate = false;
|
|
+
|
|
+ public NoBlockUpdateCommand(@NotNull String name) {
|
|
+ super(name);
|
|
+ this.description = "No Block Update Command";
|
|
+ this.usageMessage = "/blockupdate";
|
|
+ this.setPermission("bukkit.command.blockupdate");
|
|
+ final PluginManager pluginManager = Bukkit.getServer().getPluginManager();
|
|
+ if (pluginManager.getPermission("bukkit.command.blockupdate") == null) {
|
|
+ pluginManager.addPermission(new Permission("bukkit.command.blockupdate", PermissionDefault.OP));
|
|
+ }
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
|
|
+ return List.of();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
|
|
+ if (!testPermission(sender)) return true;
|
|
+ noBlockUpdate = !noBlockUpdate;
|
|
+ Bukkit.broadcast(Component.join(JoinConfiguration.noSeparators(),
|
|
+ Component.text("Block update status: ", NamedTextColor.GRAY),
|
|
+ Component.text(!noBlockUpdate, noBlockUpdate ? NamedTextColor.AQUA : NamedTextColor.GRAY)
|
|
+ ), "bukkit.command.blockupdate");
|
|
+
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ public static boolean isNoBlockUpdate() {
|
|
+ return LeavesConfig.noBlockUpdateCommand && noBlockUpdate;
|
|
+ }
|
|
+}
|