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

Fix build

Browse Source
This commit is contained in:
AlphaKR93
2023-03-25 18:19:02 +09:00
parent 8b626f6c7c
commit b27158aac2
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/api/0002-Purpur-API-Changes.patch
View File

@@ -193,7 +193,7 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c
@Override
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ac9b690fcccb60b587e5345f12f1383afd0a73a1..83571abfe9a2eb8736b481de35dfd7fd4c663f5a 100644
index a6bdd42b38454fe481f9210e1a0f5f94023a0543..e58273032706f1b85e0d32991c27048733ffa9ad 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2464,4 +2464,127 @@ public final class Bukkit {
@@ -579,7 +579,7 @@ index 69b50eee42e8c52063033705bd23a5ef5231ed83..3578ab0c3a413d56bc39af43b5d3201d
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2204336d8800311b65e894739ab1b27273e7c6f2..e0f69edf603c2ec99bc92b16b18912272cc41bd9 100644
index ce2ef5cff6ad10b64791e67f6d3cff328c2cf7dc..c293dbc96051a5a5d11dc445b8c389e2ce33ec84 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1971,6 +1971,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -932,7 +932,7 @@ index 138d2530de2410f4a9424dabd3e5ce0cd1c1dcd2..10a8d64ad2da0be2c14f34c3e7d1957c
// Paper start
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 365350d38b2eee00d22bad09ab95c6054f11d536..47f644b9cb615e2feeacb810898cf567f1cf04fc 100644
index 8c58018b155c52a7b2a139f784abceb6aa00a268..dc16fd3f342994dc3ea88b0980e4b3f56621ddf3 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -953,4 +953,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1155,7 +1155,7 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b5fd857896b3afcfa69cce55cbc2696dd625f805..08b5f448e92add21f9f9797d9cea3ac60581dff5 100644
index 5f11b2e9c1bca121ae72dd0ec94ae4a86f80a324..8d7ec62544f24bd71e4924f36fe1ee159927481d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3000,4 +3000,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1410,11 +1410,11 @@ index 01c5e8b71338fbb4b1605e45bf2a2e705188f6b5..118d53ec9d1dc9c01cedfbedaf0b8edc
* When a player gets bad omen after killing a patrol captain.
*/
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
index 35aac79a7c58d00e6b3c6c042b291093c9c7af71..7fa8909f07ce768654b9ea7c42c4913b7e2593b7 100644
index 94f127fd6ba69ca48d03acbc9886ee499e9be4f3..1f958facfed766c401144b840e4369154c71d3c2 100644
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
@@ -155,7 +155,7 @@ public enum InventoryType {
// Paper end
@@ -152,7 +152,7 @@ public enum InventoryType {
SMITHING_NEW(4, "Upgrade Gear"),
;
- private final int size;
@@ -1442,7 +1442,7 @@ index c60be4fd24c7fdf65251dd6169e5e1ac3b588d95..569deccd2f1cf21da9b5906433ac493c
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index cd487177f6e391e114c394cd736796e20e0e8982..e5f129b7bbf4257e6be056af71c4e26a01ffd658 100644
index 9d68ad599a037748d033239f54cf95941b87766a..8216b53724bfad3c29bf6b75e17f4640e4915a00 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -4076,7 +4076,7 @@ index 123647bb10fc89508437d7a0bd3fd31d58ee7c82..ce209668dd7f11b284bd7f5688191a0b
}
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
index 2cb81e6d253d70388da15c9d07b630277d486c70..fa7229ae5e00e36b0dc8b4cf15d3c99892cc3291 100644
index 06e96e5c98f1a7a68c8b4b5e527314c1aa774e38..49bba9a7a02b9cf3a552583315eff2b7dbe060c0 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -47,6 +47,10 @@ public class AnnotationTest {

8
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -2644,7 +2644,7 @@ index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d4183
int LARGE_MAX_STACK_SIZE = 64;
int DEFAULT_DISTANCE_LIMIT = 8;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 9a1e8589e6b371869b2199650172d61ae186c907..8a2429f915da389360dcb16609fef7701b4a863a 100644
index 4705d7066207250c03a5f98eef61554c901f2e35..e25be74ef0a88541884ad62a4b84219400d5a142 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2730,7 +2730,7 @@ index 9a1e8589e6b371869b2199650172d61ae186c907..8a2429f915da389360dcb16609fef770
this.level.getProfiler().push("entityBaseTick");
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
this.feetBlockState = null;
@@ -4156,16 +4190,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4162,16 +4196,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2756,7 +2756,7 @@ index 9a1e8589e6b371869b2199650172d61ae186c907..8a2429f915da389360dcb16609fef770
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4173,14 +4209,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4179,14 +4215,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -2824,7 +2824,7 @@ index 9a1e8589e6b371869b2199650172d61ae186c907..8a2429f915da389360dcb16609fef770
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4202,9 +4285,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4208,9 +4291,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}

32
patches/server/0002-Purpur-Server-Changes.patch
View File

@@ -2627,7 +2627,7 @@ index ff2862bf1f511196d1e911e2584262ed728e9a81..43bf3285729ec5cedb3de84f2b606739
}
// Paper end
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index ca5291a9573a62cb5c19539cf5c7aceff11f9829..74238a87d1ff3391aac5812b24b84af228baeaa4 100644
index a399de32d5f2f932d41fbb552780979950844a05..e5cf1bf76094b9b4e2ee9608276e0361b48ef1b4 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -274,6 +274,11 @@ public class ServerPlayer extends Player {
@@ -2957,10 +2957,10 @@ index ca5291a9573a62cb5c19539cf5c7aceff11f9829..74238a87d1ff3391aac5812b24b84af2
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index 0a3eb5e929c605d9eb7369de8ade8b49951f5d37..ebf1ac089202c06fd2cc593dc12c21fe2d0a8de8 100644
index 1d33c02088c150189d7f4b0aa27f6a1de96b11cf..75f29f6dddf50ccf7ef43ecfa602ccade3c9004d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -389,6 +389,7 @@ public class ServerPlayerGameMode {
@@ -397,6 +397,7 @@ public class ServerPlayerGameMode {
} else {capturedBlockEntity = true;} // Paper end
return false;
}
@@ -2968,7 +2968,7 @@ index 0a3eb5e929c605d9eb7369de8ade8b49951f5d37..ebf1ac089202c06fd2cc593dc12c21fe
}
// CraftBukkit end
@@ -419,7 +420,7 @@ public class ServerPlayerGameMode {
@@ -427,7 +428,7 @@ public class ServerPlayerGameMode {
ItemStack mainHandStack = null; // Paper
boolean isCorrectTool = false; // Paper
@@ -2977,7 +2977,7 @@ index 0a3eb5e929c605d9eb7369de8ade8b49951f5d37..ebf1ac089202c06fd2cc593dc12c21fe
// return true; // CraftBukkit
} else {
ItemStack itemstack = this.player.getMainHandItem();
@@ -508,6 +509,7 @@ public class ServerPlayerGameMode {
@@ -516,6 +517,7 @@ public class ServerPlayerGameMode {
public InteractionHand interactHand;
public ItemStack interactItemStack;
public InteractionResult useItemOn(ServerPlayer player, Level world, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) {
@@ -2985,7 +2985,7 @@ index 0a3eb5e929c605d9eb7369de8ade8b49951f5d37..ebf1ac089202c06fd2cc593dc12c21fe
BlockPos blockposition = hitResult.getBlockPos();
BlockState iblockdata = world.getBlockState(blockposition);
InteractionResult enuminteractionresult = InteractionResult.PASS;
@@ -568,7 +570,7 @@ public class ServerPlayerGameMode {
@@ -576,7 +578,7 @@ public class ServerPlayerGameMode {
boolean flag1 = player.isSecondaryUseActive() && flag;
ItemStack itemstack1 = stack.copy();
@@ -2994,7 +2994,7 @@ index 0a3eb5e929c605d9eb7369de8ade8b49951f5d37..ebf1ac089202c06fd2cc593dc12c21fe
enuminteractionresult = iblockdata.use(world, player, hand, hitResult);
if (enuminteractionresult.consumesAction()) {
@@ -604,4 +606,18 @@ public class ServerPlayerGameMode {
@@ -612,4 +614,18 @@ public class ServerPlayerGameMode {
public void setLevel(ServerLevel world) {
this.level = world;
}
@@ -4049,7 +4049,7 @@ index 14fab63346d56c72cd7534a04760efd10eef4295..745e792482f61c571e2efbd4200dd1bd
@Override
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8a2429f915da389360dcb16609fef7701b4a863a..4ea7bee58188ae7f4117dd705fdcc8f4be4d40ec 100644
index e25be74ef0a88541884ad62a4b84219400d5a142..b2ee73a2ef6042694ca84c27d592e5fb13b4a0fe 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -155,7 +155,7 @@ import org.bukkit.plugin.PluginManager;
@@ -4346,7 +4346,7 @@ index 8a2429f915da389360dcb16609fef7701b4a863a..4ea7bee58188ae7f4117dd705fdcc8f4
}
public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
@@ -3908,6 +3938,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3914,6 +3944,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL;
}
@@ -4367,7 +4367,7 @@ index 8a2429f915da389360dcb16609fef7701b4a863a..4ea7bee58188ae7f4117dd705fdcc8f4
@Override
public void sendSystemMessage(Component message) {}
@@ -4189,6 +4233,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4195,6 +4239,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.yRotO = this.getYRot();
}
@@ -4380,7 +4380,7 @@ index 8a2429f915da389360dcb16609fef7701b4a863a..4ea7bee58188ae7f4117dd705fdcc8f4
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
if (false && this.touchingUnloadedChunk()) { // Pufferfish - cost of a lookup here is the same cost as below, so skip
return false;
@@ -4717,4 +4767,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4723,4 +4773,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -10163,7 +10163,7 @@ index e2935115c8d41af1d623da4f0d4f73de80386129..ae663a9b32c281f745592afa614f55c0
}
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
index c6949c7ec0766bda07324a6f004b29cbd37d0f1f..0c5efd0b364e4c1f510d30094757ddb7dc979a68 100644
index 89f761871a84f8ab95f2a16aba8340bb8726da30..6e7c0e95b27c41bf12da1beb3458830ce27c6029 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -81,6 +81,33 @@ public class Sniffer extends Animal {
@@ -10200,7 +10200,7 @@ index c6949c7ec0766bda07324a6f004b29cbd37d0f1f..0c5efd0b364e4c1f510d30094757ddb7
// CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
@Override
protected void defineSynchedData() {
@@ -296,7 +323,7 @@ public class Sniffer extends Animal {
@@ -303,7 +330,7 @@ public class Sniffer extends Animal {
}
@Override
@@ -10209,7 +10209,7 @@ index c6949c7ec0766bda07324a6f004b29cbd37d0f1f..0c5efd0b364e4c1f510d30094757ddb7
super.jumpFromGround();
double d0 = this.moveControl.getSpeedModifier();
@@ -435,11 +462,11 @@ public class Sniffer extends Animal {
@@ -442,11 +469,11 @@ public class Sniffer extends Animal {
@Override
protected void customServerAiStep() {
@@ -20990,10 +20990,10 @@ index 191e8233deaa859d969d54242e297e722f3d947b..76e26542448d18750ce33d53d54c2a77
case DISPENSER:
case DROPPER:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
index 44eba9e20651c29a84def786f4a350750fdbdeeb..15b3e89702a6a8dbfcd820ac9654c9c15b95c52f 100644
index 092f6843e3b43d4c615d2eee344f5966e96ae850..cb0c851ab5fcf676da2397040835a94d4bdb4be1 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -82,7 +82,7 @@ public class CraftInventory implements Inventory {
@@ -83,7 +83,7 @@ public class CraftInventory implements Inventory {
@Override
public void setContents(ItemStack[] items) {