Skip to content

Commit c530c39

Browse files
kennytvkennytv
committed
More var name fixes
1 parent a5b8df6 commit c530c39

16 files changed

+57
-94
lines changed

‎paper-server/patches/sources/net/minecraft/world/level/block/BedBlock.java.patch‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
}
66

77
- if (!canSetSpawn(level)) {
8-
+ if (false && !canSetSpawn(level)) { // CraftBukkit - moved world and biome check into EntityHuman
8+
+ if (false && !canSetSpawn(level)) { // CraftBukkit - moved world and biome check into Player
99
level.removeBlock(pos, false);
1010
BlockPos blockPos = pos.relative(state.getValue(FACING).getOpposite());
1111
if (level.getBlockState(blockPos).is(this)) {
12-
@@ -103,22 +_,62 @@
12+
@@ -103,22 +_,56 @@
1313
level.explode(null, level.damageSources().badRespawnPointExplosion(center), null, center, 5.0F, true, Level.ExplosionInteraction.BLOCK);
1414
return InteractionResult.SUCCESS_SERVER;
1515
} else if (state.getValue(OCCUPIED)) {
@@ -21,20 +21,20 @@
2121
return InteractionResult.SUCCESS_SERVER;
2222
} else {
2323
+ // CraftBukkit start
24-
+ BlockState finaliblockdata = state;
25-
+ BlockPos finalblockposition = pos;
24+
+ final BlockState finalBlockState = state;
25+
+ final BlockPos finalBlockPos = pos;
2626
+ // CraftBukkit end
2727
player.startSleepInBed(pos).ifLeft(bedSleepingProblem -> {
2828
+ // Paper start - PlayerBedFailEnterEvent
2929
+ if (bedSleepingProblem != null) {
30-
+ io.papermc.paper.event.player.PlayerBedFailEnterEvent event = new io.papermc.paper.event.player.PlayerBedFailEnterEvent((org.bukkit.entity.Player) player.getBukkitEntity(), io.papermc.paper.event.player.PlayerBedFailEnterEvent.FailReason.values()[bedSleepingProblem.ordinal()], org.bukkit.craftbukkit.block.CraftBlock.at(level, finalblockposition), !level.dimensionType().bedWorks(), io.papermc.paper.adventure.PaperAdventure.asAdventure(bedSleepingProblem.getMessage()));
30+
+ io.papermc.paper.event.player.PlayerBedFailEnterEvent event = new io.papermc.paper.event.player.PlayerBedFailEnterEvent((org.bukkit.entity.Player) player.getBukkitEntity(), io.papermc.paper.event.player.PlayerBedFailEnterEvent.FailReason.values()[bedSleepingProblem.ordinal()], org.bukkit.craftbukkit.block.CraftBlock.at(level, finalBlockPos), !level.dimensionType().bedWorks(), io.papermc.paper.adventure.PaperAdventure.asAdventure(bedSleepingProblem.getMessage()));
3131
+ if (!event.callEvent()) {
3232
+ return;
3333
+ }
3434
+ // Paper end - PlayerBedFailEnterEvent
3535
+ // CraftBukkit start - handling bed explosion from below here
3636
+ if (event.getWillExplode()) { // Paper - PlayerBedFailEnterEvent
37-
+ this.explodeBed(finaliblockdata, level, finalblockposition);
37+
+ this.explodeBed(finalBlockState, level, finalBlockPos);
3838
+ } else
3939
+ // CraftBukkit end
4040
if (bedSleepingProblem.getMessage() != null) {
@@ -49,24 +49,18 @@
4949
}
5050
}
5151

52-
+ // CraftBukkit start
53-
+ private InteractionResult explodeBed(BlockState iblockdata, Level world, BlockPos blockposition) {
54-
+ {
55-
+ {
56-
+ org.bukkit.block.BlockState blockState = org.bukkit.craftbukkit.block.CraftBlock.at(world, blockposition).getState(); // CraftBukkit - capture BlockState before remove block
57-
+ world.removeBlock(blockposition, false);
58-
+ BlockPos blockposition1 = blockposition.relative(((Direction) iblockdata.getValue(BedBlock.FACING)).getOpposite());
52+
+ // CraftBukkit start - Copied from the above method
53+
+ private InteractionResult explodeBed(BlockState state, Level level, BlockPos pos) {
54+
+ org.bukkit.block.BlockState blockState = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos).getState(); // CraftBukkit - capture BlockState before remove block
55+
+ level.removeBlock(pos, false);
56+
+ BlockPos blockPos = pos.relative(state.getValue(FACING).getOpposite());
57+
+ if (level.getBlockState(blockPos).is(this)) {
58+
+ level.removeBlock(blockPos, false);
59+
+ }
5960
+
60-
+ if (world.getBlockState(blockposition1).getBlock() == this) {
61-
+ world.removeBlock(blockposition1, false);
62-
+ }
63-
+
64-
+ Vec3 vec3d = blockposition.getCenter();
65-
+
66-
+ world.explode(null, world.damageSources().badRespawnPointExplosion(vec3d, blockState), null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // CraftBukkit - add state
67-
+ return InteractionResult.SUCCESS;
68-
+ }
69-
+ }
61+
+ Vec3 center = pos.getCenter();
62+
+ level.explode(null, level.damageSources().badRespawnPointExplosion(center, blockState), null, center, 5.0F, true, Level.ExplosionInteraction.BLOCK); // CraftBukkit - add state
63+
+ return InteractionResult.SUCCESS_SERVER;
7064
+ }
7165
+ // CraftBukkit end
7266
+

‎paper-server/patches/sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
- this.setTiltAndScheduleTick(state, level, pos, Tilt.UNSTABLE, null);
2020
+ // CraftBukkit start - tilt dripleaf
2121
+ org.bukkit.event.Cancellable cancellable;
22-
+ if (entity instanceof net.minecraft.world.entity.player.Player) {
23-
+ cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((net.minecraft.world.entity.player.Player) entity, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null);
22+
+ if (entity instanceof net.minecraft.world.entity.player.Player player) {
23+
+ cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(player, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null);
2424
+ } else {
2525
+ cancellable = new org.bukkit.event.entity.EntityInteractEvent(entity.getBukkitEntity(), level.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()));
2626
+ level.getCraftServer().getPluginManager().callEvent((org.bukkit.event.entity.EntityInteractEvent) cancellable);

‎paper-server/patches/sources/net/minecraft/world/level/block/Block.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
+ return 0; // CraftBukkit
134134
+ }
135135
+ // CraftBukkit start
136-
+ public int getExpDrop(BlockState iblockdata, ServerLevel worldserver, BlockPos blockposition, ItemStack itemstack, boolean flag) {
136+
+ public int getExpDrop(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack, boolean dropExperience) {
137137
+ return 0;
138138
+ }
139139
+ // CraftBukkit end

‎paper-server/patches/sources/net/minecraft/world/level/block/BushBlock.java.patch‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
--- a/net/minecraft/world/level/block/BushBlock.java
22
+++ b/net/minecraft/world/level/block/BushBlock.java
3-
@@ -6,6 +_,7 @@
4-
import net.minecraft.tags.BlockTags;
5-
import net.minecraft.util.RandomSource;
6-
import net.minecraft.world.level.BlockGetter;
7-
+import net.minecraft.world.level.Level;
8-
import net.minecraft.world.level.LevelReader;
9-
import net.minecraft.world.level.ScheduledTickAccess;
10-
import net.minecraft.world.level.block.state.BlockBehaviour;
113
@@ -35,9 +_,15 @@
124
BlockState neighborState,
135
RandomSource random
@@ -18,7 +10,7 @@
1810
+ // CraftBukkit start
1911
+ if (!state.canSurvive(level, pos)) {
2012
+ // Suppress during worldgen
21-
+ if (!(level instanceof net.minecraft.server.level.ServerLevel world1 && world1.hasPhysicsEvent) || !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(world1, pos).isCancelled()) { // Paper
13+
+ if (!(level instanceof net.minecraft.server.level.ServerLevel serverLevel && serverLevel.hasPhysicsEvent) || !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(serverLevel, pos).isCancelled()) { // Paper
2214
+ return Blocks.AIR.defaultBlockState();
2315
+ }
2416
+ }

‎paper-server/patches/sources/net/minecraft/world/level/block/CakeBlock.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
- player.getFoodData().eat(2, 0.1F);
3030
- int bitesValue = state.getValue(BITES);
3131
+ // CraftBukkit start
32-
+ // entityhuman.getFoodData().eat(2, 0.1F);
32+
+ // player.getFoodData().eat(2, 0.1F);
3333
+ int oldFoodLevel = player.getFoodData().foodLevel;
3434
+
3535
+ org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, 2 + oldFoodLevel);

‎paper-server/patches/sources/net/minecraft/world/level/block/CaveVines.java.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
+ return InteractionResult.SUCCESS;
1111
+ }
1212
+
13-
+ if (entity instanceof net.minecraft.world.entity.player.Player) {
14-
+ org.bukkit.event.player.PlayerHarvestBlockEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerHarvestBlockEvent(level, pos, (net.minecraft.world.entity.player.Player) entity, net.minecraft.world.InteractionHand.MAIN_HAND, java.util.Collections.singletonList(new ItemStack(Items.GLOW_BERRIES, 1)));
13+
+ if (entity instanceof net.minecraft.world.entity.player.Player player) {
14+
+ org.bukkit.event.player.PlayerHarvestBlockEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerHarvestBlockEvent(level, pos, player, net.minecraft.world.InteractionHand.MAIN_HAND, java.util.Collections.singletonList(new ItemStack(Items.GLOW_BERRIES, 1)));
1515
+ if (event.isCancelled()) {
1616
+ return InteractionResult.SUCCESS; // We need to return a success either way, because making it PASS or FAIL will result in a bug where cancelling while harvesting w/ block in hand places block
1717
+ }

‎paper-server/patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
public static BlockState extractProduce(Entity entity, BlockState state, Level level, BlockPos pos) {
4040
+ // CraftBukkit start
4141
+ if (entity != null && !(entity instanceof Player)) {
42-
+ BlockState iblockdata1 = ComposterBlock.empty(entity, state, org.bukkit.craftbukkit.util.DummyGeneratorAccess.INSTANCE, pos);
43-
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, pos, iblockdata1)) {
42+
+ BlockState emptyState = ComposterBlock.empty(entity, state, org.bukkit.craftbukkit.util.DummyGeneratorAccess.INSTANCE, pos);
43+
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, pos, emptyState)) {
4444
+ return state;
4545
+ }
4646
+ }
@@ -100,9 +100,9 @@
100100

101101
public static class EmptyContainer extends SimpleContainer implements WorldlyContainer {
102102
- public EmptyContainer() {
103-
+ public EmptyContainer(LevelAccessor generatoraccess, BlockPos blockposition) { // CraftBukkit
103+
+ public EmptyContainer(LevelAccessor levelAccessor, BlockPos blockPos) { // CraftBukkit
104104
super(0);
105-
+ this.bukkitOwner = new org.bukkit.craftbukkit.inventory.CraftBlockInventoryHolder(generatoraccess, blockposition, this); // CraftBukkit
105+
+ this.bukkitOwner = new org.bukkit.craftbukkit.inventory.CraftBlockInventoryHolder(levelAccessor, blockPos, this); // CraftBukkit
106106
}
107107

108108
@Override

‎paper-server/patches/sources/net/minecraft/world/level/block/CrafterBlock.java.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
+
3232
+ org.bukkit.inventory.Inventory destinationInventory;
3333
+ // Have to special case large chests as they work oddly
34-
+ if (containerAt instanceof CompoundContainer) {
35-
+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((CompoundContainer) containerAt);
34+
+ if (containerAt instanceof CompoundContainer compoundContainer) {
35+
+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest(compoundContainer);
3636
+ } else {
3737
+ destinationInventory = containerAt.getOwner().getInventory();
3838
+ }
@@ -57,8 +57,8 @@
5757
+
5858
+ org.bukkit.inventory.Inventory destinationInventory;
5959
+ // Have to special case large chests as they work oddly
60-
+ if (containerAt instanceof CompoundContainer) {
61-
+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((CompoundContainer) containerAt);
60+
+ if (containerAt instanceof CompoundContainer compoundContainer) {
61+
+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest(compoundContainer);
6262
+ } else {
6363
+ destinationInventory = containerAt.getOwner().getInventory();
6464
+ }

‎paper-server/patches/sources/net/minecraft/world/level/block/DropExperienceBlock.java.patch‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
@Override
55
protected void spawnAfterBreak(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack, boolean dropExperience) {
66
super.spawnAfterBreak(state, level, pos, stack, dropExperience);
7-
- if (dropExperience) {
8-
- this.tryDropExperience(level, pos, stack, this.xpRange);
9-
- }
107
+ // CraftBukkit start - Delegate to getExpDrop
118
+ }
129
+
1310
+ @Override
14-
+ public int getExpDrop(BlockState iblockdata, ServerLevel worldserver, BlockPos blockposition, ItemStack itemstack, boolean flag) {
15-
+ if (flag) {
16-
+ return this.tryDropExperience(worldserver, blockposition, itemstack, this.xpRange);
11+
+ public int getExpDrop(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack, boolean dropExperience) {
12+
if (dropExperience) {
13+
- this.tryDropExperience(level, pos, stack, this.xpRange);
14+
- }
15+
+ return this.tryDropExperience(level, pos, stack, this.xpRange);
1716
+ }
1817
+
1918
+ return 0;

‎paper-server/patches/sources/net/minecraft/world/level/block/DropperBlock.java.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
+
4040
+ org.bukkit.inventory.Inventory destinationInventory;
4141
+ // Have to special case large chests as they work oddly
42-
+ if (containerAt instanceof CompoundContainer) {
43-
+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((CompoundContainer) containerAt);
42+
+ if (containerAt instanceof CompoundContainer compoundContainer) {
43+
+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest(compoundContainer);
4444
+ } else {
4545
+ destinationInventory = containerAt.getOwner().getInventory();
4646
+ }

0 commit comments

Comments
 (0)