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

More cleanup of var names

Browse Source
This commit is contained in:
Nassim Jahnke
2024-12-21 15:53:00 +01:00
parent fd4c10947f
commit 70ef43b8dd
8 changed files with 30 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch
View File

@@ -214,12 +214,8 @@
this.cookingTimer = 0;
this.setChanged();
}
@@ -339,11 +_,11 @@
}
@Override
- public void awardUsedRecipes(Player player, List<ItemStack> items) {
+ public void awardUsedRecipes(net.minecraft.world.entity.player.Player player, List<ItemStack> items) {
@@ -342,8 +_,8 @@
public void awardUsedRecipes(Player player, List<ItemStack> items) {
}
- public void awardUsedRecipesAndPopExperience(ServerPlayer player) {

8
paper-server/patches/sources/net/minecraft/world/level/block/entity/BannerBlockEntity.java.patch
View File

@@ -61,11 +61,11 @@
}
+
+ // CraftBukkit start
+ public void setPatterns(BannerPatternLayers bannerpatternlayers) {
+ if (bannerpatternlayers.layers().size() > 20) {
+ bannerpatternlayers = new BannerPatternLayers(java.util.List.copyOf(bannerpatternlayers.layers().subList(0, 20)));
+ public void setPatterns(BannerPatternLayers bannerPatternLayers) {
+ if (bannerPatternLayers.layers().size() > 20) {
+ bannerPatternLayers = new BannerPatternLayers(java.util.List.copyOf(bannerPatternLayers.layers().subList(0, 20)));
+ }
+ this.patterns = bannerpatternlayers;
+ this.patterns = bannerPatternLayers;
+ }
+ // CraftBukkit end
}

4
paper-server/patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch
View File

@@ -4,7 +4,7 @@
private List<BeehiveBlockEntity.BeeData> stored = Lists.newArrayList();
@Nullable
public BlockPos savedFlowerPos;
+ public int maxBees = 3; // CraftBukkit - allow setting max amount of bees a hive can hold
+ public int maxBees = MAX_OCCUPANTS; // CraftBukkit - allow setting max amount of bees a hive can hold
public BeehiveBlockEntity(BlockPos pos, BlockState blockState) {
super(BlockEntityType.BEEHIVE, pos, blockState);
@@ -64,7 +64,7 @@
+ if (this.level != null) {
+ org.bukkit.event.entity.EntityEnterBlockEvent event = new org.bukkit.event.entity.EntityEnterBlockEvent(bee.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(this.level, this.getBlockPos()));
+ if (!event.callEvent()) {
+ bee.setStayOutOfHiveCountdown(400);
+ bee.setStayOutOfHiveCountdown(MIN_TICKS_BEFORE_REENTERING_HIVE);
+ return;
+ }
+ }