Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream ()

Browse Source 
Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
lexikiq
2022-03-01 16:47:05 -05:00
parent 9aa2e4da7e
commit cad9362f3d
10 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@@ -1,8 +1,8 @@
group = gg.projecteden.parchment
version = 1.18.1-R0.1-SNAPSHOT
version = 1.18.2-R0.1-SNAPSHOT
mcVersion = 1.18.1
paperRef = 30cb7d0407bfb01a3bc0cc2da1dc0af32dfae5a4
mcVersion = 1.18.2
paperRef = 0859f594698246d3999ea9829393bc90cf783088
org.gradle.caching=true
org.gradle.parallel=true

12
patches/server/0001-Build-changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 4662952bd0a389fe77e00ede9ab4a57f33522794..39a1d297feef86c9427a605b1ff2b7fa3fae370e 100644
index 4beb35d1e5b013395f5df101e843f41c2ce174ad..a2f1e252630c4ac0f2521a3f53be60116995617e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,8 +18,8 @@ repositories {
@@ -104,10 +104,10 @@ index ece77f5ea4b14bbed7c070131b3251ea86764538..71bf426f7fb58fff6739bb1332d1286d
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c847a2b935130a293d9ac4c196c9cff27470649b..b624314d1c21be56b85764eb3fe3c76db63f7589 100644
index 0a0bc8c45cb70073cb94dee25b5e54fb98bf9c8e..780a88c7fcab402f1908ee1959f907e52d998a2e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1719,7 +1719,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1685,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -117,10 +117,10 @@ index c847a2b935130a293d9ac4c196c9cff27470649b..b624314d1c21be56b85764eb3fe3c76d
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 51f67a2944034552d57b939ef29e0249e74383b9..bb3c7383d774dec2951cf29ea516d242de25a15f 100644
index 5a6290e5d7b82dbc069d159ea53292e4dbc94d03..3336f223f9f0c6207471de15326f40d2ddc1dae2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -130,7 +130,7 @@ index 51f67a2944034552d57b939ef29e0249e74383b9..bb3c7383d774dec2951cf29ea516d242
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index f810bebfca3932c80e20646eb0680f7718506707..e7a94177d6cecc422fb20745549b09e117b5cdc7 100644
index afcc80d1f79d1743b0940c69858eacec88fec889..8fcd1d4f4cc74a281c419ada3470b6823494a8c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -269,7 +269,7 @@ public class Main {

16
patches/server/0003-Add-SoundEvent.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add SoundEvent
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 768017ba650f1bd96e3db0aad8fda939e2ea7add..47ccd16dd86072805359266b746ff9a70e4513ad 100644
index 8e87aca16879d7dd1dc0bd17d3215fca40b547cd..8013aa65752e15217b5ae99e012fb745205b9853 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1509,12 +1509,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1510,12 +1510,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@Override
public void playSound(@Nullable Player except, double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch) {
@@ -24,10 +24,10 @@ index 768017ba650f1bd96e3db0aad8fda939e2ea7add..47ccd16dd86072805359266b746ff9a7
@Override
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 470dbed47830e2f580c090bc762a7be5cf389ce5..c0ec32d2575bd9bfcea81ec60af22bb341b7802b 100644
index e74c13e7aaa144fcd07036de70e80bebf0be698a..397d2c48c57a58c32b96c712d1c9682ac7dd0b87 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2189,7 +2189,7 @@ public class ServerPlayer extends Player {
@@ -2187,7 +2187,7 @@ public class ServerPlayer extends Player {
@Override
public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) {
@@ -37,7 +37,7 @@ index 470dbed47830e2f580c090bc762a7be5cf389ce5..c0ec32d2575bd9bfcea81ec60af22bb3
@Override
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 7a0c1ba40156df69bbbf36d96bed0950130d2351..7d535b82ccfd3d5269ecaeb35a8cb9ac7d18a69a 100644
index f5852341161b0d632e22af9b3e625ca1e786bd63..e3783298e50d8b75a00f7ad7ca1e7a7b8209e6d9 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -967,7 +967,7 @@ public abstract class PlayerList {
@@ -50,10 +50,10 @@ index 7a0c1ba40156df69bbbf36d96bed0950130d2351..7d535b82ccfd3d5269ecaeb35a8cb9ac
}
// Added from changeDimension
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index d85da02be7f1d494af8f2cc840c49073774f5f9c..a90cbb8d5c3231f3278bd4893fa1443827c6567b 100644
index 9c767096ca950d55d6002282c7a3fe2884bcd630..c4db8912d3af42cc4da825e8b43f3fdf4d49e1b5 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1833,7 +1833,7 @@ public abstract class Player extends LivingEntity {
@@ -1846,7 +1846,7 @@ public abstract class Player extends LivingEntity {
private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
fromEntity.level.playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity himself
if (fromEntity instanceof ServerPlayer) {
@@ -63,7 +63,7 @@ index d85da02be7f1d494af8f2cc840c49073774f5f9c..a90cbb8d5c3231f3278bd4893fa14438
}
// Paper end
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java
index 7131226de05bc57830f7a68ba545ebfd19d33a59..56b5f5f9992c9f9fea7a606684efd44c901e3525 100644
index f50abfd058e3adf1cf8c0f4468a60bc04e8541e7..2ff60e8fa65626a9805597776b9163fd40e6807d 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raid.java
+++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java
@@ -26,7 +26,7 @@ import net.minecraft.nbt.ListTag;

6
patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch
View File

@@ -79,10 +79,10 @@ index a828cad27fcd39f8bfbaefa97052a2a3b6650ee7..52cce7422c2a99e3de37f87ac7041516
return "DamageSource (" + this.msgId + ")";
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index e17a3afa41fd628d2c4a3637ae19418e258a99b8..5a4489dff8b6ef70d52ba19ee8604b77d9c73791 100644
index 1eb76c456790b81b657090377dd5ea547898f9a5..7bd04a04461a89043f698c402d33efbd295f7449 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -101,10 +101,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -99,10 +99,11 @@ public class EnderDragon extends Mob implements Enemy {
private final Node[] nodes = new Node[24];
private final int[] nodeAdjacency = new int[24];
private final BinaryHeap openSet = new BinaryHeap();
@@ -96,7 +96,7 @@ index e17a3afa41fd628d2c4a3637ae19418e258a99b8..5a4489dff8b6ef70d52ba19ee8604b77
this.setHealth(this.getMaxHealth());
this.noPhysics = true;
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index 97f99a06b8954b08af9f4156abe8abdad359349a..4b40ba434a88f241ffbbb1a58ba9015f4fc35cec 100644
index 29f6c10e2c2626a9726d295acf12efea2b463cd3..370bde9e458a11c504a52356524fd289569612f1 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -471,6 +471,13 @@ public class Explosion {

12
patches/server/0007-Expose-EntityType-Ordinals.patch
View File

@@ -5,19 +5,19 @@ Subject: [PATCH] Expose EntityType Ordinals
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 419a7e9614af2328ed401fc954196056243a984c..b657453b61a29c920b87e94d23fc09e9be7fc296 100644
index 79abd84696ef099f6b12ddeaa6e398f18c53316a..13e277c9ff27a52fbf7041c36d7c5ff6d0028cfc 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -148,6 +148,8 @@ import org.apache.logging.log4j.Logger;
@@ -150,6 +150,8 @@ import org.slf4j.Logger;
public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
+ private static int ordinal = 0; // Parchment
+ private static final java.util.Map<EntityType, Integer> ordinals = new java.util.HashMap<>(); // Parchment
private static final Logger LOGGER = LogManager.getLogger();
private static final Logger LOGGER = LogUtils.getLogger();
public static final String ENTITY_TAG = "EntityTag";
private static final float MAGIC_HORSE_WIDTH = 1.3964844F;
@@ -282,9 +284,31 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
private final Holder.Reference<EntityType<?>> builtInRegistryHolder;
@@ -285,9 +287,31 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
private final EntityDimensions dimensions;
private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
@@ -51,7 +51,7 @@ index 419a7e9614af2328ed401fc954196056243a984c..b657453b61a29c920b87e94d23fc09e9
return Registry.ENTITY_TYPE.getKey(type);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 5d287d4cb1c9302479d8d2dd92939b4832991a92..fc03814909c0a128af74bdc09bc0b6a62859d05d 100644
index 6fa8fdfeec2af4a669e60c5a238c81f90f19c546..b3c6cf1c6bd37815ef144965b8af7825b15e08e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -634,6 +634,18 @@ public final class CraftMagicNumbers implements UnsafeValues {

4
patches/server/0008-Add-Player-setGameProfile.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#setGameProfile
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index a90cbb8d5c3231f3278bd4893fa1443827c6567b..9a903745bbeb68c7b056e35866c731656315f01c 100644
index c4db8912d3af42cc4da825e8b43f3fdf4d49e1b5..86e6c4ce5b5dee9e1fc12deca288310ee485337c 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1452,6 +1452,12 @@ public abstract class Player extends LivingEntity {
@@ -1465,6 +1465,12 @@ public abstract class Player extends LivingEntity {
return this.gameProfile;
}

4
patches/server/0009-Expose-MCUtil-Executors.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bb3c7383d774dec2951cf29ea516d242de25a15f..7ae15e38d65a6f122d6a710f91ed3cbe9322dd47 100644
index 3336f223f9f0c6207471de15326f40d2ddc1dae2..a193f2ab16fecc26c04408a4473e064dd79168dd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2857,4 +2857,16 @@ public final class CraftServer implements Server {
@@ -2833,4 +2833,16 @@ public final class CraftServer implements Server {
}
// Paper end

10
patches/server/0011-Add-BlockDropResourcesEvent.patch
View File

@@ -8,10 +8,10 @@ to easily get the items being dropped by any
block instead of only blocks broken by players.
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index ab5b9f00123e2ede2931ffc520684e482aac49b4..51e69414e37d824d1d8b1e1b82bcf700d4afe0f0 100644
index a80f4dc0a642c744223a155232291ace6e007636..f76849d67d71bf5bed1b9006adfee1c1b90b05d6 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -304,7 +304,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -306,7 +306,7 @@ public class Block extends BlockBehaviour implements ItemLike {
ServerLevel worldserver = lootContext.getLevel();
BlockPos blockposition = new BlockPos((Vec3) lootContext.getParameter(LootContextParams.ORIGIN));
@@ -20,7 +20,7 @@ index ab5b9f00123e2ede2931ffc520684e482aac49b4..51e69414e37d824d1d8b1e1b82bcf700
Block.popResource(worldserver, blockposition, itemstack);
});
state.spawnAfterBreak(worldserver, blockposition, ItemStack.EMPTY);
@@ -312,7 +312,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -314,7 +314,7 @@ public class Block extends BlockBehaviour implements ItemLike {
public static void dropResources(BlockState state, Level world, BlockPos pos) {
if (world instanceof ServerLevel) {
@@ -29,7 +29,7 @@ index ab5b9f00123e2ede2931ffc520684e482aac49b4..51e69414e37d824d1d8b1e1b82bcf700
Block.popResource(world, pos, itemstack);
});
state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY);
@@ -322,7 +322,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -324,7 +324,7 @@ public class Block extends BlockBehaviour implements ItemLike {
public static void dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity) {
if (world instanceof ServerLevel) {
@@ -38,7 +38,7 @@ index ab5b9f00123e2ede2931ffc520684e482aac49b4..51e69414e37d824d1d8b1e1b82bcf700
Block.popResource((ServerLevel) world, pos, itemstack);
});
state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY);
@@ -349,7 +349,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -351,7 +351,7 @@ public class Block extends BlockBehaviour implements ItemLike {
public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, Entity entity, ItemStack stack) {
if (world instanceof ServerLevel) {

4
patches/server/0012-Add-Furnace-Recipe-API.patch
View File

@@ -215,10 +215,10 @@ index 0000000000000000000000000000000000000000..e7114e456f818d7bdd4081620f4b9b93
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 2c3ce2065812de227c34506edddb439da9a07ba1..e238c3ac4948081bc28d03d45f6f1e2b097f0f97 100644
index a3ddeb9862bc87294c215dc906cd8cca8f699b62..2e9efad46a1b395040a7dff6f80382ea9a2ae980 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2312,4 +2312,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2316,4 +2316,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return this.adventure$pointers;
}
// Paper end

4
patches/server/0013-Disable-sleep-status-announcements.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable sleep status announcements
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 47ccd16dd86072805359266b746ff9a70e4513ad..2135c3e9df70c9c3e492e63f9c348510f488b121 100644
index 8013aa65752e15217b5ae99e012fb745205b9853..98a54230527d97820f8d7873fb1c4adb71ee06d5 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -896,7 +896,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -897,7 +897,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
private void announceSleepStatus() {