From 78ff16111e2553ebf9c377c64a095b799ee3ca7c Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sat, 16 Jan 2021 12:00:00 +1100 Subject: [PATCH] Update to Minecraft 1.16.5 By: md_5 --- paper-server/nms-patches/BiomeStorage.patch | 9 --------- paper-server/nms-patches/BlockCampfire.patch | 2 +- .../nms-patches/BlockFireAbstract.patch | 17 ++-------------- paper-server/nms-patches/Entity.patch | 8 ++++---- .../nms-patches/EntityArmorStand.patch | 8 ++++---- .../nms-patches/EntityFishingHook.patch | 12 +++++------ paper-server/nms-patches/EntityHuman.patch | 12 +++++------ .../nms-patches/EntityItemFrame.patch | 9 --------- paper-server/nms-patches/EntityLiving.patch | 6 +++--- paper-server/nms-patches/EntityPlayer.patch | 8 ++++---- paper-server/nms-patches/EntityPotion.patch | 6 +++--- paper-server/nms-patches/ItemBlock.patch | 4 ++-- paper-server/nms-patches/ItemFireball.patch | 2 +- paper-server/nms-patches/ItemStack.patch | 2 +- .../nms-patches/LootTableRegistry.patch | 6 +++--- .../nms-patches/MinecraftServer.patch | 4 ++-- .../nms-patches/SoundEffectType.patch | 15 -------------- paper-server/nms-patches/WorldAccess.patch | 4 ++-- paper-server/nms-patches/WorldServer.patch | 4 ++-- paper-server/pom.xml | 20 +++++++++++++------ .../craftbukkit/CraftChunkSnapshot.java | 2 +- .../bukkit/craftbukkit/CraftSoundGroup.java | 14 ++++++------- .../org/bukkit/craftbukkit/CraftWorld.java | 4 ++-- .../java/org/bukkit/craftbukkit/Main.java | 2 +- .../craftbukkit/entity/CraftItemFrame.java | 4 ++-- .../generator/CustomChunkGenerator.java | 4 ++-- .../craftbukkit/util/CraftMagicNumbers.java | 2 +- 27 files changed, 76 insertions(+), 114 deletions(-) delete mode 100644 paper-server/nms-patches/SoundEffectType.patch diff --git a/paper-server/nms-patches/BiomeStorage.patch b/paper-server/nms-patches/BiomeStorage.patch index a45f20c3a1..278584550d 100644 --- a/paper-server/nms-patches/BiomeStorage.patch +++ b/paper-server/nms-patches/BiomeStorage.patch @@ -1,14 +1,5 @@ --- a/net/minecraft/server/BiomeStorage.java +++ b/net/minecraft/server/BiomeStorage.java -@@ -12,7 +12,7 @@ - public static final int a = 1 << BiomeStorage.e + BiomeStorage.e + BiomeStorage.f; - public static final int b = (1 << BiomeStorage.e) - 1; - public static final int c = (1 << BiomeStorage.f) - 1; -- private final Registry g; -+ public final Registry g; // PAIL - private final BiomeBase[] h; - - public BiomeStorage(Registry registry, BiomeBase[] abiomebase) { @@ -87,4 +87,14 @@ return this.h[i1 << BiomeStorage.e + BiomeStorage.e | j1 << BiomeStorage.e | l]; diff --git a/paper-server/nms-patches/BlockCampfire.patch b/paper-server/nms-patches/BlockCampfire.patch index 3cc6405bd0..eaf134b9fc 100644 --- a/paper-server/nms-patches/BlockCampfire.patch +++ b/paper-server/nms-patches/BlockCampfire.patch @@ -1,7 +1,7 @@ --- a/net/minecraft/server/BlockCampfire.java +++ b/net/minecraft/server/BlockCampfire.java @@ -144,6 +144,11 @@ - if (flag && !(Boolean) iblockdata.get(BlockCampfire.b) && !(Boolean) iblockdata.get(BlockCampfire.d)) { + if (flag && !(Boolean) iblockdata.get(BlockCampfire.LIT) && !(Boolean) iblockdata.get(BlockCampfire.d)) { BlockPosition blockposition = movingobjectpositionblock.getBlockPosition(); + // CraftBukkit start diff --git a/paper-server/nms-patches/BlockFireAbstract.patch b/paper-server/nms-patches/BlockFireAbstract.patch index a84cd77f97..5e4f7014c2 100644 --- a/paper-server/nms-patches/BlockFireAbstract.patch +++ b/paper-server/nms-patches/BlockFireAbstract.patch @@ -33,21 +33,8 @@ } @Override -@@ -83,6 +90,12 @@ - } - - private static boolean b(World world, BlockPosition blockposition, EnumDirection enumdirection) { -+ // CraftBukkit start - SPIGOT-6311: Do not calculate portals for up/down directions -+ if (enumdirection == EnumDirection.UP || enumdirection == EnumDirection.DOWN) { -+ return false; -+ } -+ // CraftBukkit end -+ - if (!a(world)) { - return false; - } else { -@@ -103,4 +116,12 @@ - return flag && BlockPortalShape.a((GeneratorAccess) world, blockposition, enumdirection.h().n()).isPresent(); +@@ -109,4 +116,12 @@ + } } } + diff --git a/paper-server/nms-patches/Entity.patch b/paper-server/nms-patches/Entity.patch index c399fc83a2..f0777967d0 100644 --- a/paper-server/nms-patches/Entity.patch +++ b/paper-server/nms-patches/Entity.patch @@ -698,8 +698,8 @@ + final WorldServer worldserverFinal = worldserver = ((CraftWorld) event.getTo().getWorld()).getHandle(); + blockposition = new BlockPosition(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ()); -- return (ShapeDetectorShape) this.a(worldserver, blockposition, flag2).map((blockutil_rectangle) -> { -+ return (ShapeDetectorShape) this.a(worldserver, blockposition, flag2, event.getSearchRadius(), event.getCanCreatePortal(), event.getCreationRadius()).map((blockutil_rectangle) -> { +- return (ShapeDetectorShape) this.findOrCreatePortal(worldserver, blockposition, flag2).map((blockutil_rectangle) -> { ++ return (ShapeDetectorShape) this.findOrCreatePortal(worldserver, blockposition, flag2, event.getSearchRadius(), event.getCanCreatePortal(), event.getCreationRadius()).map((blockutil_rectangle) -> { + // CraftBukkit end IBlockData iblockdata = this.world.getType(this.ac); EnumDirection.EnumAxis enumdirection_enumaxis; @@ -736,7 +736,7 @@ return BlockPortalShape.a(blockutil_rectangle, enumdirection_enumaxis, this.getPositionVector(), this.a(this.getPose())); } -- protected Optional a(WorldServer worldserver, BlockPosition blockposition, boolean flag) { +- protected Optional findOrCreatePortal(WorldServer worldserver, BlockPosition blockposition, boolean flag) { - return worldserver.getTravelAgent().findPortal(blockposition, flag); + // CraftBukkit start + protected CraftPortalEvent callPortalEvent(Entity entity, WorldServer exitWorldServer, BlockPosition exitPosition, PlayerTeleportEvent.TeleportCause cause, int searchRadius, int creationRadius) { @@ -752,7 +752,7 @@ + return new CraftPortalEvent(event); + } + -+ protected Optional a(WorldServer worldserver, BlockPosition blockposition, boolean flag, int searchRadius, boolean canCreatePortal, int createRadius) { // PAIL rename findOrCreatePortal ++ protected Optional findOrCreatePortal(WorldServer worldserver, BlockPosition blockposition, boolean flag, int searchRadius, boolean canCreatePortal, int createRadius) { + return worldserver.getTravelAgent().findPortal(blockposition, searchRadius); + // CraftBukkit end } diff --git a/paper-server/nms-patches/EntityArmorStand.patch b/paper-server/nms-patches/EntityArmorStand.patch index a28ae517df..4351c5c4ee 100644 --- a/paper-server/nms-patches/EntityArmorStand.patch +++ b/paper-server/nms-patches/EntityArmorStand.patch @@ -43,13 +43,13 @@ + // CraftBukkit end switch (enumitemslot.a()) { case HAND: -- this.b(itemstack); -+ this.b(itemstack, silent); // CraftBukkit +- this.playEquipSound(itemstack); ++ this.playEquipSound(itemstack, silent); // CraftBukkit this.handItems.set(enumitemslot.b(), itemstack); break; case ARMOR: -- this.b(itemstack); -+ this.b(itemstack, silent); // CraftBukkit +- this.playEquipSound(itemstack); ++ this.playEquipSound(itemstack, silent); // CraftBukkit this.armorItems.set(enumitemslot.b(), itemstack); } diff --git a/paper-server/nms-patches/EntityFishingHook.patch b/paper-server/nms-patches/EntityFishingHook.patch index 3a2c6d32ec..8836fbe140 100644 --- a/paper-server/nms-patches/EntityFishingHook.patch +++ b/paper-server/nms-patches/EntityFishingHook.patch @@ -14,7 +14,7 @@ @@ -25,6 +30,12 @@ private final int an; - private final int ao; + private final int lureLevel; + // CraftBukkit start - Extra variables to enable modification of fishing wait time, values are minecraft defaults + public int minWaitTime = 100; @@ -26,7 +26,7 @@ super(EntityTypes.FISHING_BOBBER, world); this.b = new Random(); @@ -253,6 +264,10 @@ - this.ah = 0; + this.waitTime = 0; this.ai = 0; this.getDataWatcher().set(EntityFishingHook.f, false); + // CraftBukkit start @@ -54,11 +54,11 @@ this.ai = MathHelper.nextInt(this.random, 20, 80); } } else { -- this.ah = MathHelper.nextInt(this.random, 100, 600); -- this.ah -= this.ao * 20 * 5; +- this.waitTime = MathHelper.nextInt(this.random, 100, 600); +- this.waitTime -= this.lureLevel * 20 * 5; + // CraftBukkit start - logic to modify fishing wait time -+ this.ah = MathHelper.nextInt(this.random, this.minWaitTime, this.maxWaitTime); // PAIL rename waitTime -+ this.ah -= (this.applyLure) ? this.ao * 20 * 5 : 0; // PAIL rename waitTime, lureLevel ++ this.waitTime = MathHelper.nextInt(this.random, this.minWaitTime, this.maxWaitTime); ++ this.waitTime -= (this.applyLure) ? this.lureLevel * 20 * 5 : 0; + // CraftBukkit end } } diff --git a/paper-server/nms-patches/EntityHuman.patch b/paper-server/nms-patches/EntityHuman.patch index 8e8269442b..9cd25686d0 100644 --- a/paper-server/nms-patches/EntityHuman.patch +++ b/paper-server/nms-patches/EntityHuman.patch @@ -384,16 +384,16 @@ + public void setSlot(EnumItemSlot enumitemslot, ItemStack itemstack, boolean silent) { + // CraftBukkit end if (enumitemslot == EnumItemSlot.MAINHAND) { -- this.b(itemstack); -+ this.b(itemstack, silent); // CraftBukkit +- this.playEquipSound(itemstack); ++ this.playEquipSound(itemstack, silent); // CraftBukkit this.inventory.items.set(this.inventory.itemInHandIndex, itemstack); } else if (enumitemslot == EnumItemSlot.OFFHAND) { -- this.b(itemstack); -+ this.b(itemstack, silent); // CraftBukkit +- this.playEquipSound(itemstack); ++ this.playEquipSound(itemstack, silent); // CraftBukkit this.inventory.extraSlots.set(0, itemstack); } else if (enumitemslot.a() == EnumItemSlot.Function.ARMOR) { -- this.b(itemstack); -+ this.b(itemstack, silent); // CraftBukkit +- this.playEquipSound(itemstack); ++ this.playEquipSound(itemstack, silent); // CraftBukkit this.inventory.armor.set(enumitemslot.b(), itemstack); } diff --git a/paper-server/nms-patches/EntityItemFrame.patch b/paper-server/nms-patches/EntityItemFrame.patch index caa815f285..13cff21e36 100644 --- a/paper-server/nms-patches/EntityItemFrame.patch +++ b/paper-server/nms-patches/EntityItemFrame.patch @@ -1,14 +1,5 @@ --- a/net/minecraft/server/EntityItemFrame.java +++ b/net/minecraft/server/EntityItemFrame.java -@@ -10,7 +10,7 @@ - private static final Logger LOGGER = LogManager.getLogger(); - private static final DataWatcherObject ITEM = DataWatcher.a(EntityItemFrame.class, DataWatcherRegistry.g); - private static final DataWatcherObject g = DataWatcher.a(EntityItemFrame.class, DataWatcherRegistry.b); -- private float ag = 1.0F; -+ public float ag = 1.0F; // PAIL itemDropChance - public boolean fixed; - - public EntityItemFrame(EntityTypes entitytypes, World world) { @@ -53,16 +53,27 @@ @Override protected void updateBoundingBox() { diff --git a/paper-server/nms-patches/EntityLiving.patch b/paper-server/nms-patches/EntityLiving.patch index 7bdc401ca6..aa645b0765 100644 --- a/paper-server/nms-patches/EntityLiving.patch +++ b/paper-server/nms-patches/EntityLiving.patch @@ -88,13 +88,13 @@ @@ -497,7 +541,13 @@ } - protected void b(ItemStack itemstack) { + protected void playEquipSound(ItemStack itemstack) { - if (!itemstack.isEmpty()) { + // CraftBukkit start -+ this.b(itemstack, false); ++ this.playEquipSound(itemstack, false); + } + -+ protected void b(ItemStack itemstack, boolean silent) { ++ protected void playEquipSound(ItemStack itemstack, boolean silent) { + if (!itemstack.isEmpty() && !silent) { + // CraftBukkit end SoundEffect soundeffect = SoundEffects.ITEM_ARMOR_EQUIP_GENERIC; diff --git a/paper-server/nms-patches/EntityPlayer.patch b/paper-server/nms-patches/EntityPlayer.patch index d3489682f0..bba4c90057 100644 --- a/paper-server/nms-patches/EntityPlayer.patch +++ b/paper-server/nms-patches/EntityPlayer.patch @@ -503,10 +503,10 @@ } @Override -- protected Optional a(WorldServer worldserver, BlockPosition blockposition, boolean flag) { -- Optional optional = super.a(worldserver, blockposition, flag); -+ protected Optional a(WorldServer worldserver, BlockPosition blockposition, boolean flag, int searchRadius, boolean canCreatePortal, int createRadius) { // CraftBukkit // PAIL rename findOrCreatePortal -+ Optional optional = super.a(worldserver, blockposition, flag, searchRadius, canCreatePortal, createRadius); // CraftBukkit +- protected Optional findOrCreatePortal(WorldServer worldserver, BlockPosition blockposition, boolean flag) { +- Optional optional = super.findOrCreatePortal(worldserver, blockposition, flag); ++ protected Optional findOrCreatePortal(WorldServer worldserver, BlockPosition blockposition, boolean flag, int searchRadius, boolean canCreatePortal, int createRadius) { // CraftBukkit ++ Optional optional = super.findOrCreatePortal(worldserver, blockposition, flag, searchRadius, canCreatePortal, createRadius); // CraftBukkit - if (optional.isPresent()) { + if (optional.isPresent() || !canCreatePortal) { // CraftBukkit diff --git a/paper-server/nms-patches/EntityPotion.patch b/paper-server/nms-patches/EntityPotion.patch index e83e891373..385a334520 100644 --- a/paper-server/nms-patches/EntityPotion.patch +++ b/paper-server/nms-patches/EntityPotion.patch @@ -121,12 +121,12 @@ } else if (BlockCampfire.g(iblockdata)) { - this.world.a((EntityHuman) null, 1009, blockposition, 0); - BlockCampfire.c((GeneratorAccess) this.world, blockposition, iblockdata); -- this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.b, false)); +- this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.LIT, false)); + // CraftBukkit start -+ if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.set(BlockCampfire.b, false)).isCancelled()) { // PAIL rename LIT ++ if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.set(BlockCampfire.LIT, false)).isCancelled()) { + this.world.a((EntityHuman) null, 1009, blockposition, 0); + BlockCampfire.c((GeneratorAccess) this.world, blockposition, iblockdata); -+ this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.b, false)); ++ this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.LIT, false)); + } + // CraftBukkit end } diff --git a/paper-server/nms-patches/ItemBlock.patch b/paper-server/nms-patches/ItemBlock.patch index 6afa8d1870..557e1a04b4 100644 --- a/paper-server/nms-patches/ItemBlock.patch +++ b/paper-server/nms-patches/ItemBlock.patch @@ -45,9 +45,9 @@ SoundEffectType soundeffecttype = iblockdata1.getStepSound(); -- world.playSound(entityhuman, blockposition, this.a(iblockdata1), SoundCategory.BLOCKS, (soundeffecttype.a() + 1.0F) / 2.0F, soundeffecttype.b() * 0.8F); +- world.playSound(entityhuman, blockposition, this.a(iblockdata1), SoundCategory.BLOCKS, (soundeffecttype.getVolume() + 1.0F) / 2.0F, soundeffecttype.getPitch() * 0.8F); - if (entityhuman == null || !entityhuman.abilities.canInstantlyBuild) { -+ // world.playSound(entityhuman, blockposition, this.a(iblockdata1), SoundCategory.BLOCKS, (soundeffecttype.a() + 1.0F) / 2.0F, soundeffecttype.b() * 0.8F); ++ // world.playSound(entityhuman, blockposition, this.a(iblockdata1), SoundCategory.BLOCKS, (soundeffecttype.getVolume() + 1.0F) / 2.0F, soundeffecttype.getPitch() * 0.8F); + if ((entityhuman == null || !entityhuman.abilities.canInstantlyBuild) && itemstack != ItemStack.b) { // CraftBukkit itemstack.subtract(1); } diff --git a/paper-server/nms-patches/ItemFireball.patch b/paper-server/nms-patches/ItemFireball.patch index e37ba4c975..c25dce95d8 100644 --- a/paper-server/nms-patches/ItemFireball.patch +++ b/paper-server/nms-patches/ItemFireball.patch @@ -13,7 +13,7 @@ + } + // CraftBukkit end this.a(world, blockposition); - world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.b, true)); + world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.LIT, true)); flag = true; } else { blockposition = blockposition.shift(itemactioncontext.getClickedFace()); diff --git a/paper-server/nms-patches/ItemStack.patch b/paper-server/nms-patches/ItemStack.patch index b449157c1d..52f41aa5e5 100644 --- a/paper-server/nms-patches/ItemStack.patch +++ b/paper-server/nms-patches/ItemStack.patch @@ -232,7 +232,7 @@ + // SPIGOT-1288 - play sound stripped from ItemBlock + if (this.item instanceof ItemBlock) { + SoundEffectType soundeffecttype = ((ItemBlock) this.item).getBlock().stepSound; -+ world.playSound(entityhuman, blockposition, soundeffecttype.e(), SoundCategory.BLOCKS, (soundeffecttype.a() + 1.0F) / 2.0F, soundeffecttype.b() * 0.8F); ++ world.playSound(entityhuman, blockposition, soundeffecttype.getPlaceSound(), SoundCategory.BLOCKS, (soundeffecttype.getVolume() + 1.0F) / 2.0F, soundeffecttype.getPitch() * 0.8F); + } + + entityhuman.b(StatisticList.ITEM_USED.b(item)); diff --git a/paper-server/nms-patches/LootTableRegistry.patch b/paper-server/nms-patches/LootTableRegistry.patch index 7c2d2bad4e..f14f8e73e4 100644 --- a/paper-server/nms-patches/LootTableRegistry.patch +++ b/paper-server/nms-patches/LootTableRegistry.patch @@ -3,7 +3,7 @@ @@ -15,6 +15,7 @@ private static final Logger LOGGER = LogManager.getLogger(); private static final Gson b = LootSerialization.c().create(); - private Map c = ImmutableMap.of(); + private Map keyToLootTable = ImmutableMap.of(); + public Map lootTableToKey = ImmutableMap.of(); // CraftBukkit private final LootPredicateManager d; @@ -20,10 +20,10 @@ @@ -62,6 +63,11 @@ LootTableRegistry.LOGGER.warn("Found validation problem in " + s + ": " + s1); }); - this.c = immutablemap; + this.keyToLootTable = immutablemap; + // CraftBukkit start - build a reversed registry map + ImmutableMap.Builder lootTableToKeyBuilder = ImmutableMap.builder(); -+ this.c.forEach((lootTable, key) -> lootTableToKeyBuilder.put(key, lootTable)); // PAIL rename keyToLootTable ++ this.keyToLootTable.forEach((lootTable, key) -> lootTableToKeyBuilder.put(key, lootTable)); // PAIL rename keyToLootTable + this.lootTableToKey = lootTableToKeyBuilder.build(); + // CraftBukkit end } diff --git a/paper-server/nms-patches/MinecraftServer.patch b/paper-server/nms-patches/MinecraftServer.patch index 21fdfe1f76..1ac53cfbf8 100644 --- a/paper-server/nms-patches/MinecraftServer.patch +++ b/paper-server/nms-patches/MinecraftServer.patch @@ -447,9 +447,9 @@ + // CraftBukkit end worldloadlistener.b(); chunkproviderserver.getLightEngine().a(5); -- this.bc(); +- this.updateSpawnFlags(); + // CraftBukkit start -+ // this.bc(); ++ // this.updateSpawnFlags(); + worldserver.setSpawnFlags(this.getSpawnMonsters(), this.getSpawnAnimals()); + + this.forceTicks = false; diff --git a/paper-server/nms-patches/SoundEffectType.patch b/paper-server/nms-patches/SoundEffectType.patch deleted file mode 100644 index d8e784b841..0000000000 --- a/paper-server/nms-patches/SoundEffectType.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/net/minecraft/server/SoundEffectType.java -+++ b/net/minecraft/server/SoundEffectType.java -@@ -51,10 +51,10 @@ - public static final SoundEffectType U = new SoundEffectType(1.0F, 1.0F, SoundEffects.BLOCK_GILDED_BLACKSTONE_BREAK, SoundEffects.BLOCK_GILDED_BLACKSTONE_STEP, SoundEffects.BLOCK_GILDED_BLACKSTONE_PLACE, SoundEffects.BLOCK_GILDED_BLACKSTONE_HIT, SoundEffects.BLOCK_GILDED_BLACKSTONE_FALL); - public final float V; - public final float W; -- private final SoundEffect X; -+ public final SoundEffect X; // PAIL private -> public, rename breakSound - private final SoundEffect Y; - private final SoundEffect Z; -- private final SoundEffect aa; -+ public final SoundEffect aa; // PAIL private -> public, rename hitSound - private final SoundEffect ab; - - public SoundEffectType(float f, float f1, SoundEffect soundeffect, SoundEffect soundeffect1, SoundEffect soundeffect2, SoundEffect soundeffect3, SoundEffect soundeffect4) { diff --git a/paper-server/nms-patches/WorldAccess.patch b/paper-server/nms-patches/WorldAccess.patch index 01ee8eae20..b3f75a9a54 100644 --- a/paper-server/nms-patches/WorldAccess.patch +++ b/paper-server/nms-patches/WorldAccess.patch @@ -4,13 +4,13 @@ WorldServer getMinecraftWorld(); default void addAllEntities(Entity entity) { -- entity.cp().forEach(this::addEntity); +- entity.recursiveStream().forEach(this::addEntity); + // CraftBukkit start + this.addAllEntities(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT); } + + default void addAllEntities(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) { -+ entity.cp().forEach((e) -> this.addEntity(e, reason)); ++ entity.recursiveStream().forEach((e) -> this.addEntity(e, reason)); + } + // CraftBukkit end } diff --git a/paper-server/nms-patches/WorldServer.patch b/paper-server/nms-patches/WorldServer.patch index bba6fabbe4..64a8877e65 100644 --- a/paper-server/nms-patches/WorldServer.patch +++ b/paper-server/nms-patches/WorldServer.patch @@ -123,7 +123,7 @@ + // CraftBukkit end public void a(int i, int j, boolean flag, boolean flag1) { - this.worldDataServer.a(i); + this.worldDataServer.setClearWeatherTime(i); @@ -193,6 +261,7 @@ this.rainLevel = MathHelper.a(this.rainLevel, 0.0F, 1.0F); } @@ -405,7 +405,7 @@ + + public boolean addAllEntitiesSafely(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) { + // CraftBukkit end - if (entity.cp().anyMatch(this::isUUIDTaken)) { + if (entity.recursiveStream().anyMatch(this::isUUIDTaken)) { return false; } else { - this.addAllEntities(entity); diff --git a/paper-server/pom.xml b/paper-server/pom.xml index 313fce1279..43dc4cab5e 100644 --- a/paper-server/pom.xml +++ b/paper-server/pom.xml @@ -4,7 +4,7 @@ org.bukkit craftbukkit jar - 1.16.4-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT CraftBukkit https://www.spigotmc.org/ @@ -12,7 +12,8 @@ true UTF-8 unknown - 1.16.4 + git + 1.16.5 1_16_R3 1.8 1.8 @@ -42,11 +43,18 @@ log4j-iostreams 2.8.1 compile + + + + org.apache.logging.log4j + log4j-api + + org.ow2.asm asm - 8.0.1 + 9.0 compile @@ -111,7 +119,7 @@ scriptus 0.4.1 - git-Bukkit-%s + ${bt.name}-Bukkit-%s @@ -256,7 +264,7 @@ org.eclipse.jdt ecj - 3.22.0 + 3.24.0 @@ -309,7 +317,7 @@ com.puppycrawl.tools checkstyle - 8.36.2 + 8.39 diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java index ff8ba54574..6cd662c913 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java @@ -130,7 +130,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot { Preconditions.checkState(biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true"); CraftChunk.validateChunkCoordinates(x, y, z); - return CraftBlock.biomeBaseToBiome((IRegistry) biome.g, biome.getBiome(x >> 2, y >> 2, z >> 2)); + return CraftBlock.biomeBaseToBiome((IRegistry) biome.registry, biome.getBiome(x >> 2, y >> 2, z >> 2)); } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSoundGroup.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSoundGroup.java index 7ba9598999..c9f7ba1d51 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSoundGroup.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSoundGroup.java @@ -24,36 +24,36 @@ public class CraftSoundGroup implements SoundGroup { @Override public float getVolume() { - return getHandle().V; // PAIL rename volume + return getHandle().getVolume(); } @Override public float getPitch() { - return getHandle().W; // PAIL rename pitch + return getHandle().getPitch(); } @Override public Sound getBreakSound() { - return CraftSound.getBukkit(getHandle().X); + return CraftSound.getBukkit(getHandle().breakSound); } @Override public Sound getStepSound() { - return CraftSound.getBukkit(getHandle().d()); // PAIL rename getStepSound + return CraftSound.getBukkit(getHandle().getStepSound()); } @Override public Sound getPlaceSound() { - return CraftSound.getBukkit(getHandle().e()); // PAIL rename getPlaceSound + return CraftSound.getBukkit(getHandle().getPlaceSound()); } @Override public Sound getHitSound() { - return CraftSound.getBukkit(getHandle().aa); + return CraftSound.getBukkit(getHandle().hitSound); } @Override public Sound getFallSound() { - return CraftSound.getBukkit(getHandle().g()); // PAIL rename getFallSound + return CraftSound.getBukkit(getHandle().getFallSound()); } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index ec88f571a9..39009e61d8 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1325,12 +1325,12 @@ public class CraftWorld implements World { @Override public void setClearWeatherDuration(int duration) { - world.worldDataServer.a(duration); // PAIL rename setClearWeatherDuration + world.worldDataServer.setClearWeatherTime(duration); } @Override public int getClearWeatherDuration() { - return world.worldDataServer.h(); // PAIL rename getClearWeatherDuration + return world.worldDataServer.getClearWeatherTime(); } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java index fcfeb0aa55..cf86959d12 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java @@ -177,7 +177,7 @@ public class Main { useConsole = false; } - if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { + if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L); Calendar deadline = Calendar.getInstance(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java index ee9035cefc..4452204684 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -72,13 +72,13 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { @Override public float getItemDropChance() { - return getHandle().ag; + return getHandle().itemDropChance; } @Override public void setItemDropChance(float chance) { Preconditions.checkArgument(0.0 <= chance && chance <= 1.0, "Chance outside range [0, 1]"); - getHandle().ag = chance; + getHandle().itemDropChance = chance; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/paper-server/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java index 6d69454426..c8bce32eac 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java @@ -67,12 +67,12 @@ public class CustomChunkGenerator extends InternalChunkGenerator { @Override public Biome getBiome(int x, int y, int z) { - return CraftBlock.biomeBaseToBiome((IRegistry) biome.g, biome.getBiome(x >> 2, y >> 2, z >> 2)); + return CraftBlock.biomeBaseToBiome((IRegistry) biome.registry, biome.getBiome(x >> 2, y >> 2, z >> 2)); } @Override public void setBiome(int x, int y, int z, Biome bio) { - biome.setBiome(x >> 2, y >> 2, z >> 2, CraftBlock.biomeToBiomeBase((IRegistry) biome.g, bio)); + biome.setBiome(x >> 2, y >> 2, z >> 2, CraftBlock.biomeToBiomeBase((IRegistry) biome.registry, bio)); } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java index 1e138a569f..6194d8aac0 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -224,7 +224,7 @@ public final class CraftMagicNumbers implements UnsafeValues { * @return string */ public String getMappingsVersion() { - return "da85101b34b252659e3ddf10c0c57cc9"; + return "54e89c47309b53737f894f1bf1b0edbe"; } @Override