SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.21.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
paper-server/nms-patches/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.patch Normal file
View File

@@ -0,0 +1,32 @@
--- a/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java
+++ b/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java
@@ -10,6 +10,11 @@
import net.minecraft.world.level.block.BlockRedstoneWire;
import net.minecraft.world.level.block.state.IBlockData;
+// CraftBukkit start
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.event.block.BlockRedstoneEvent;
+// CraftBukkit end
+
public class DefaultRedstoneWireEvaluator extends RedstoneWireEvaluator {
public DefaultRedstoneWireEvaluator(BlockRedstoneWire blockredstonewire) {
@@ -20,7 +25,16 @@
public void updatePowerStrength(World world, BlockPosition blockposition, IBlockData iblockdata, @Nullable Orientation orientation, boolean flag) {
int i = this.calculateTargetStrength(world, blockposition);
- if ((Integer) iblockdata.getValue(BlockRedstoneWire.POWER) != i) {
+ // CraftBukkit start
+ int oldPower = iblockdata.getValue(BlockRedstoneWire.POWER);
+ if (oldPower != i) {
+ BlockRedstoneEvent event = new BlockRedstoneEvent(CraftBlock.at(world, blockposition), oldPower, i);
+ world.getCraftServer().getPluginManager().callEvent(event);
+
+ i = event.getNewCurrent();
+ }
+ if (oldPower != i) {
+ // CraftBukkit end
if (world.getBlockState(blockposition) == iblockdata) {
world.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockRedstoneWire.POWER, i), 2);
}

32
paper-server/nms-patches/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.patch Normal file
View File

@@ -0,0 +1,32 @@
--- a/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
+++ b/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
@@ -17,6 +17,11 @@
import net.minecraft.world.level.block.state.properties.BlockPropertyRedstoneSide;
import net.minecraft.world.level.block.state.properties.BlockStateEnum;
+// CraftBukkit start
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.event.block.BlockRedstoneEvent;
+// CraftBukkit end
+
public class ExperimentalRedstoneWireEvaluator extends RedstoneWireEvaluator {
private final Deque<BlockPosition> wiresToTurnOff = new ArrayDeque();
@@ -41,7 +46,16 @@
int j = unpackPower(i);
IBlockData iblockdata1 = world.getBlockState(blockposition1);
- if (iblockdata1.is((Block) this.wireBlock) && !((Integer) iblockdata1.getValue(BlockRedstoneWire.POWER)).equals(j)) {
+ // CraftBukkit start
+ int oldPower = iblockdata.getValue(BlockRedstoneWire.POWER);
+ if (oldPower != j) {
+ BlockRedstoneEvent event = new BlockRedstoneEvent(CraftBlock.at(world, blockposition1), oldPower, j);
+ world.getCraftServer().getPluginManager().callEvent(event);
+
+ j = event.getNewCurrent();
+ }
+ if (iblockdata1.is((Block) this.wireBlock) && oldPower != j) {
+ // CraftBukkit end
int k = 2;
if (!flag || !flag1) {

12
paper-server/nms-patches/net/minecraft/world/level/redstone/NeighborUpdater.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/level/redstone/NeighborUpdater.java
+++ b/net/minecraft/world/level/redstone/NeighborUpdater.java
@@ -12,6 +12,13 @@
import net.minecraft.world.level.World;
@@ -13,6 +13,13 @@
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.IBlockData;
+// CraftBukkit start
+import net.minecraft.server.level.WorldServer;
@@ -14,14 +14,14 @@
public interface NeighborUpdater {
@@ -46,6 +53,17 @@
@@ -50,6 +57,17 @@
static void executeUpdate(World world, IBlockData iblockdata, BlockPosition blockposition, Block block, BlockPosition blockposition1, boolean flag) {
static void executeUpdate(World world, IBlockData iblockdata, BlockPosition blockposition, Block block, @Nullable Orientation orientation, boolean flag) {
try {
+ // CraftBukkit start
+ CraftWorld cworld = ((WorldServer) world).getWorld();
+ if (cworld != null) {
+ BlockPhysicsEvent event = new BlockPhysicsEvent(CraftBlock.at(world, blockposition), CraftBlockData.fromData(iblockdata), CraftBlock.at(world, blockposition1));
+ BlockPhysicsEvent event = new BlockPhysicsEvent(CraftBlock.at(world, blockposition), CraftBlockData.fromData(iblockdata));
+ ((WorldServer) world).getCraftServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
@@ -29,6 +29,6 @@
+ }
+ }
+ // CraftBukkit end
iblockdata.handleNeighborChanged(world, blockposition, block, blockposition1, flag);
iblockdata.handleNeighborChanged(world, blockposition, block, orientation, flag);
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception while updating neighbours");