Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-18 12:30:06 +01:00
Fixed mis-placed CraftBukkit comments
Dieser Commit ist enthalten in:
Ursprung
14d69f1513
Commit
fe41b017ca
nms-patches
@ -1,5 +1,5 @@
|
||||
--- ../work/decompile-8eb82bde/net/minecraft/server/BlockCactus.java 2014-12-11 00:12:27.888272532 +0000
|
||||
+++ src/main/java/net/minecraft/server/BlockCactus.java 2014-12-11 00:10:42.528273676 +0000
|
||||
--- ../work/decompile-8eb82bde/net/minecraft/server/BlockCactus.java 2014-12-11 00:44:17.652251803 +0000
|
||||
+++ src/main/java/net/minecraft/server/BlockCactus.java 2014-12-11 00:43:46.164252144 +0000
|
||||
@@ -3,6 +3,8 @@
|
||||
import java.util.Iterator;
|
||||
import java.util.Random;
|
||||
@ -9,20 +9,18 @@
|
||||
public class BlockCactus extends Block {
|
||||
|
||||
public static final BlockStateInteger AGE = BlockStateInteger.of("age", 0, 15);
|
||||
@@ -28,10 +30,11 @@
|
||||
@@ -28,9 +30,10 @@
|
||||
int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue();
|
||||
|
||||
if (j == 15) {
|
||||
- world.setTypeUpdate(blockposition1, this.getBlockData());
|
||||
+ // world.setTypeUpdate(blockposition1, this.getBlockData());
|
||||
+ // world.setTypeUpdate(blockposition1, this.getBlockData()); // CraftBukkit
|
||||
IBlockData iblockdata1 = iblockdata.set(BlockCactus.AGE, Integer.valueOf(0));
|
||||
|
||||
- world.setTypeAndData(blockposition, iblockdata1, 4);
|
||||
+ CraftEventFactory.handleBlockGrowEvent(world, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ(), this, 0); // CraftBukkit
|
||||
+ world.setTypeAndData(blockposition, iblockdata1, 4); // CraftBukkit
|
||||
world.setTypeAndData(blockposition, iblockdata1, 4);
|
||||
this.doPhysics(world, blockposition1, iblockdata1, this);
|
||||
} else {
|
||||
world.setTypeAndData(blockposition, iblockdata.set(BlockCactus.AGE, Integer.valueOf(j + 1)), 4);
|
||||
@@ -83,7 +86,9 @@
|
||||
}
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
--- ../work/decompile-8eb82bde/net/minecraft/server/BlockReed.java 2014-12-11 00:12:28.088272530 +0000
|
||||
+++ src/main/java/net/minecraft/server/BlockReed.java 2014-12-11 00:10:59.832273488 +0000
|
||||
--- ../work/decompile-8eb82bde/net/minecraft/server/BlockReed.java 2014-12-11 00:44:17.804251801 +0000
|
||||
+++ src/main/java/net/minecraft/server/BlockReed.java 2014-12-11 00:43:36.504252249 +0000
|
||||
@@ -29,8 +29,13 @@
|
||||
int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue();
|
||||
|
||||
if (j == 15) {
|
||||
- world.setTypeUpdate(blockposition.up(), this.getBlockData());
|
||||
+ // CraftBukkit start
|
||||
+ // world.setTypeUpdate(blockposition.up(), this.getBlockData());
|
||||
+ BlockPosition upPos = blockposition.up();
|
||||
+ // world.setTypeUpdate(blockposition.up(), this.getBlockData()); // CraftBukkit
|
||||
+ BlockPosition upPos = blockposition.up();
|
||||
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, upPos.getX(), upPos.getY(), upPos.getZ(), this, 0);
|
||||
world.setTypeAndData(blockposition, iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4);
|
||||
+ // CraftBukkit end
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren