aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patches/api/0445-add-missing-Experimental-annotations.patch13
-rw-r--r--patches/server/0003-Build-system-changes.patch4
-rw-r--r--patches/server/0006-MC-Dev-fixes.patch13
-rw-r--r--patches/server/0008-CB-fixes.patch22
-rw-r--r--patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch4
-rw-r--r--patches/server/0144-Fix-this-stupid-bullshit.patch4
-rw-r--r--patches/server/0780-Missing-eating-regain-reason.patch12
-rw-r--r--patches/server/0801-Add-EntityToggleSitEvent.patch8
-rw-r--r--patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch10
m---------work/Bukkit0
m---------work/CraftBukkit0
11 files changed, 47 insertions, 43 deletions
diff --git a/patches/api/0445-add-missing-Experimental-annotations.patch b/patches/api/0445-add-missing-Experimental-annotations.patch
index d8d8192ab3..568617597e 100644
--- a/patches/api/0445-add-missing-Experimental-annotations.patch
+++ b/patches/api/0445-add-missing-Experimental-annotations.patch
@@ -613,7 +613,7 @@ index 65d3d8fd5f00114dc388d65321a9affe1b32ce20..8e39f282c771ddafe5d890dcf065c56f
private static Structure getStructure(String name) {
diff --git a/src/main/java/org/bukkit/loot/LootTables.java b/src/main/java/org/bukkit/loot/LootTables.java
-index d87214444118f57dad31898cf776b9e4a368d11d..b3fcb501e69136df73943e1752df41a477111d59 100644
+index fe1af164da1e27f413a66acf2856d35bd2f72b6c..0cbdeb044beeef59285f5d6ed8782aa8b46e80d9 100644
--- a/src/main/java/org/bukkit/loot/LootTables.java
+++ b/src/main/java/org/bukkit/loot/LootTables.java
@@ -35,24 +35,34 @@ public enum LootTables implements Keyed {
@@ -651,3 +651,14 @@ index d87214444118f57dad31898cf776b9e4a368d11d..b3fcb501e69136df73943e1752df41a4
TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"),
SHIPWRECK_MAP("chests/shipwreck_map"),
SHIPWRECK_SUPPLY("chests/shipwreck_supply"),
+@@ -180,8 +190,10 @@ public enum LootTables implements Keyed {
+ PIGLIN_BARTERING("gameplay/piglin_bartering"),
+ // Spawners
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ TRIAL_CHAMBER_KEY("spawners/trial_chamber/key"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"),
+ // Archaeology
+ DESERT_WELL_ARCHAEOLOGY("archaeology/desert_well"),
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index 163868dafe..b483193167 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -135,7 +135,7 @@ index a2a8bce29ec5540de89095574dfdc0ca9b17bbd3..d92cd89373f8373c367ce422328b9836
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4fad736163683f49502ccd2d3122a4eef0a4a20e..a7921cde2b6275d730879b2814cc5f430520b051 100644
+index dc1021186ad4c4db26fb498e58ddec06f8bc1cf6..96210dd54e8ff6dc0375a8d03bf14fec1b26aaeb 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -209,7 +209,7 @@ public class Main {
@@ -146,7 +146,7 @@ index 4fad736163683f49502ccd2d3122a4eef0a4a20e..a7921cde2b6275d730879b2814cc5f43
+ Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
Calendar deadline = Calendar.getInstance();
- deadline.add(Calendar.DAY_OF_YEAR, -7);
+ deadline.add(Calendar.DAY_OF_YEAR, -28);
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch
index 8e5eb9dca7..271ad7735f 100644
--- a/patches/server/0006-MC-Dev-fixes.patch
+++ b/patches/server/0006-MC-Dev-fixes.patch
@@ -141,19 +141,6 @@ index 2dc801061025888192c3bf2c4c38b928c16a0165..ca788f0dcec4a117b410fe8348969e05
}
public static <T> SortedArraySet<T> create(Comparator<T> comparator) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index ff5c0d5a7dd263869ba1eb93f2e81e8c6de42f26..869f60e9407ed1c5bee536ef91a21f4d11f8f964 100644
---- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -148,7 +148,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
- @Override
- protected void customServerAiStep() {
- this.level().getProfiler().push("camelBrain");
-- Brain<?> brain = this.getBrain();
-+ Brain<Camel> brain = (Brain<Camel>) this.getBrain(); // Paper - decompile fix
- brain.tick((ServerLevel)this.level(), this);
- this.level().getProfiler().pop();
- this.level().getProfiler().push("camelActivityUpdate");
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
index e1b9e25f1f8352bf6825a5827b6b354ef7a93203..90e4e0ec0c7b0ece23c4b53f5f12b1f24e1c18ad 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch
index d0c88b5473..98d20522e6 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/server/0008-CB-fixes.patch
@@ -17,7 +17,7 @@ Subject: [PATCH] CB fixes
Co-authored-by: Spottedleaf <[email protected]>
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 674c996af91de91ee6302cc67334b836ea4fa4de..93867b8883c6f5d5086e8fdc153e6d7c1e5d9fec 100644
+index aac9513ff4d3d494860bd06607cf8af5e466fd5b..30fc222c384938fb4fdd4c6715295aeea57094bc 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -296,7 +296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -30,18 +30,24 @@ index 674c996af91de91ee6302cc67334b836ea4fa4de..93867b8883c6f5d5086e8fdc153e6d7c
if ((this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END
this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenOptions().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 869f60e9407ed1c5bee536ef91a21f4d11f8f964..95e5d1d707e610c930b6098a86c5162fd29bf602 100644
+index b2f37e3caf305f7f2c19c59848717bf73bd2ef5d..87c8460324ff2d2a14e1404fcfa3adb2d336a089 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -445,9 +445,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -462,15 +462,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
}
@Override
-- protected void actuallyHurt(DamageSource source, float amount) {
-+ protected boolean actuallyHurt(DamageSource source, float amount) { // Paper - Fix CB...
+- // CraftBukkit start - void -> boolean
+- protected boolean actuallyHurt(DamageSource damagesource, float f) {
+- boolean hurt = super.actuallyHurt(damagesource, f);
+- if (!hurt) {
+- return hurt;
+- }
+- // CraftBukkit end
++ protected boolean actuallyHurt(DamageSource damagesource, float f) { // Paper - change return type to boolean
this.standUpInstantly();
-- super.actuallyHurt(source, amount);
-+ return super.actuallyHurt(source, amount); // Paper - Fix CB...
+- return hurt; // CraftBukkit
++ return super.actuallyHurt(damagesource, f); // Paper - change return type to boolean
}
@Override
@@ -101,7 +107,7 @@ index cd39509d383c47319b71797e5d1df41c2b8c7ab6..2cc1871c81056acd0582184bb684e672
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c8f0570b7d37a0c0bddb0a65c36fb32de584df8f..02060584892d630d91f58e864ed34656ee738572 100644
+index 19725db76dc3a12356993aed7edba507b52fe4d7..c2e1376bb06442297bda806ed8dc92f10cbbdd9a 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -122,6 +122,7 @@ public class Main {
diff --git a/patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 06b6b9aded..fc9a21d7a5 100644
--- a/patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -32,11 +32,11 @@ index 48c40f12649735f14204c516eace6905b2ac0019..56a63adc3c0c919594c3f2646d4cf5b8
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 c312c450055965d63db0ccdee8aa8e34e7051d0b..9f4c5a6f22719ae30d88ca02a1db4a3f39957943 100644
+index cf0390e8ccb8e4845e3a14fa71b2547996b69baf..6c1e3254c9a20ba58c7285d4cf6a01489862100d 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -241,12 +241,25 @@ public class Main {
- deadline.add(Calendar.DAY_OF_YEAR, -7);
+ deadline.add(Calendar.DAY_OF_YEAR, -28);
if (buildDate.before(deadline.getTime())) {
System.err.println("*** Error, this build is outdated ***");
- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
diff --git a/patches/server/0144-Fix-this-stupid-bullshit.patch b/patches/server/0144-Fix-this-stupid-bullshit.patch
index 1abc5b13f3..f71529aaed 100644
--- a/patches/server/0144-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0144-Fix-this-stupid-bullshit.patch
@@ -31,12 +31,12 @@ index 8ff786c366332588a2df053438f23cc9fb7e2b84..c887d34171f89c731d76c4ca92c70be2
Bootstrap.isBootstrapped = true;
Instant instant = Instant.now();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 659b32d49016a23475f3bbda1548a78101b468ce..623c7304a6849e994e22cd559177d9de0dd2f4c4 100644
+index 1bd54fbadc9b1b5207325c78298cc72f61455ac7..a7a376e91fca80dd96f5a3e8910eba9772c67bfe 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -258,10 +258,12 @@ public class Main {
Calendar deadline = Calendar.getInstance();
- deadline.add(Calendar.DAY_OF_YEAR, -7);
+ deadline.add(Calendar.DAY_OF_YEAR, -28);
if (buildDate.before(deadline.getTime())) {
- System.err.println("*** Error, this build is outdated ***");
+ // Paper start - This is some stupid bullshit
diff --git a/patches/server/0780-Missing-eating-regain-reason.patch b/patches/server/0780-Missing-eating-regain-reason.patch
index d03459459f..1a46d0af82 100644
--- a/patches/server/0780-Missing-eating-regain-reason.patch
+++ b/patches/server/0780-Missing-eating-regain-reason.patch
@@ -18,18 +18,18 @@ index 1d0c424be2b67cad0f8bca85070a9c46a6b283da..f760ce7d9df79ef58f8963de3e901cba
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 95e5d1d707e610c930b6098a86c5162fd29bf602..be8e056f82e348d7cd14bb22a873207cddfb3044 100644
+index 87c8460324ff2d2a14e1404fcfa3adb2d336a089..090d36d73b12fec59782142e2e85f17ba35dc6be 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -384,7 +384,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
- } else {
- boolean bl = this.getHealth() < this.getMaxHealth();
- if (bl) {
+@@ -392,7 +392,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+ boolean flag = this.getHealth() < this.getMaxHealth();
+
+ if (flag) {
- this.heal(2.0F);
+ this.heal(2.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason
}
- boolean bl2 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
+ boolean flag1 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
index 91fb62807b3c5600c83d4dc8d3fadf36e94e2133..9b5b894d43f25566ab9c3698705e978ab823a0d2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
diff --git a/patches/server/0801-Add-EntityToggleSitEvent.patch b/patches/server/0801-Add-EntityToggleSitEvent.patch
index 3db46de79b..e149e09cf1 100644
--- a/patches/server/0801-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0801-Add-EntityToggleSitEvent.patch
@@ -69,10 +69,10 @@ index 4abd26c7baf8f198f13dd41a3146f9ece13a4164..0297e234f17c6157cfff79420b9eeaf4
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index be8e056f82e348d7cd14bb22a873207cddfb3044..5f879ec74cadc8b27f3c1648890978dbdc27f9f0 100644
+index 090d36d73b12fec59782142e2e85f17ba35dc6be..7860331b640fe48d1f2357d9f8e2e40c682b3620 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -556,7 +556,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -580,7 +580,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
}
public void sitDown() {
@@ -81,7 +81,7 @@ index be8e056f82e348d7cd14bb22a873207cddfb3044..5f879ec74cadc8b27f3c1648890978db
this.playSound(SoundEvents.CAMEL_SIT, 1.0F, this.getVoicePitch());
this.setPose(Pose.SITTING);
this.gameEvent(GameEvent.ENTITY_ACTION);
-@@ -565,7 +565,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -589,7 +589,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
}
public void standUp() {
@@ -90,7 +90,7 @@ index be8e056f82e348d7cd14bb22a873207cddfb3044..5f879ec74cadc8b27f3c1648890978db
this.playSound(SoundEvents.CAMEL_STAND, 1.0F, this.getVoicePitch());
this.setPose(Pose.STANDING);
this.gameEvent(GameEvent.ENTITY_ACTION);
-@@ -574,6 +574,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -598,6 +598,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
}
public void standUpInstantly() {
diff --git a/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
index 2ef92033bd..e7f91ee16c 100644
--- a/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
@@ -69,18 +69,18 @@ index 0297e234f17c6157cfff79420b9eeaf4e0e2c3ab..d683c49fdf2d1e5b0f2620641f9c241e
if (this.level().isClientSide || this.isSitting() || this.isInWater()) {
return InteractionResult.PASS;
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 5f879ec74cadc8b27f3c1648890978dbdc27f9f0..1f09d47b0ffb07b49b4d8bd79a371dd61f1c2a92 100644
+index 7860331b640fe48d1f2357d9f8e2e40c682b3620..84ae19bf9bddd2b6ee4737577d8836d59be028c2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -389,7 +389,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -398,7 +398,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+ boolean flag1 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
- boolean bl2 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
- if (bl2) {
+ if (flag1) {
- this.setInLove(player);
+ this.setInLove(player, item.copy()); // Paper - Fix EntityBreedEvent copying
}
- boolean bl3 = this.isBaby();
+ boolean flag2 = this.isBaby();
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
index 94dd97662ba07689fbfa16ef5c7d99fe12ce83de..815eb15086976b8f9e03bf8182d9ed50aec14720 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 9a80d38c002509a4849c5e5f735dca9f9b5731e
+Subproject 7ca2b46c1a7d7479e45a79aa2db86de5c7fd20d
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 98b6c1ac7d4698ded83d96217861b071e519b30
+Subproject 176c0ad39fffd8a6003e686b910fc02b669f143
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 17:08:04 +0000