Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c95bc5f Don't unpack loot table for TEs not in world (#9918)
PaperMC/Paper@6675d13 Fix strikeLightningEffect powers lightning rods & clears copper (#9780)
PaperMC/Paper@63e77b5 Add Enchantment cost API (#9856)
PaperMC/Paper@d8847bc Updated Upstream (Bukkit/CraftBukkit) (#9922)
PaperMC/Paper@dd47ec6 Add Entity Movement Direction API (#7085)
PaperMC/Paper@9ee60ec Add aggressive mob API (#9838)
PaperMC/Paper@531ef27 Use ApiStatus.Internal instead of Deprecated (#9042)
PaperMC/Paper@9548629 Add hand to fish event for all player interactions (#9929)
PaperMC/Paper@aee3830 Deprecate Material#isInteractable (#9216)
PaperMC/Paper@a506b48 Fix several issues with EntityBreedEvent (#8677)
PaperMC/Paper@f186318 Run the chat callback on the main thread as expected (#9935)
This commit is contained in:
granny
2023-11-12 01:44:08 -08:00
parent ea2835bfe1
commit 1adf78b91a
41 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0102-Make-entity-breeding-times-configurable.patch
View File

@@ -22,7 +22,7 @@ index 0cc411dd39d981187c9e9a3c5eb8043b19a09b98..f7032f4ea55f5aca293c2640686238b7
// CraftBukkit end
world.broadcastEntityEvent(entityvillager2, (byte) 12);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
index 5fe0b2301dbd1bedaa26254f7f88931c2022d709..2e268aa614522b40fbffabce4017b228db5bcba8 100644
index 70d3dcfdc9cd21bd347fc71db3f9446c94fdb381..a434d91b8dfff30cff81df964ea8149caa8cb604 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
@@ -42,6 +42,7 @@ public abstract class Animal extends AgeableMob {
@@ -33,7 +33,7 @@ index 5fe0b2301dbd1bedaa26254f7f88931c2022d709..2e268aa614522b40fbffabce4017b228
protected Animal(EntityType<? extends Animal> type, Level world) {
super(type, world);
@@ -272,8 +273,10 @@ public abstract class Animal extends AgeableMob {
@@ -281,8 +282,10 @@ public abstract class Animal extends AgeableMob {
entityplayer.awardStat(Stats.ANIMALS_BRED);
CriteriaTriggers.BRED_ANIMALS.trigger(entityplayer, this, entityanimal, entityageable);
} // Paper
@@ -111,7 +111,7 @@ index d42c8bcd85ffb1e00d2883485bf22981611b0bc3..c501704251e5b23f697efc307ebdc906
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
index f26fa004e1372f8711e76bc7fa4cdb383b989755..b13429e254bd056cf942f39d46976ff0ef2a97f3 100644
index 72bdeff4cacac8669e2608ef9353318cb5fb16f0..fc4b66e0a0561fc6705a50dc65b1120301f02f77 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -188,6 +188,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -172,7 +172,7 @@ index 14daac1a87e32e0ff0a610aef256e20cbfe50001..3fe751839e4a1bc266b0d9508e1e3384
return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
index 2832d7cbcfad43b3f0f6c33504cff68add85601d..e91f950b64f80fb86795c570f7f119c159315472 100644
index 6c7354ca03efdaf9e01d4a63f8ac38e74c0c35c8..0d5cc20029e1876b79927a89716e2ecc144791e3 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
@@ -146,6 +146,11 @@ public class Panda extends Animal {
@@ -300,7 +300,7 @@ index eecdb1f1d49951cb8a294d176afd12c68fb6c3b1..39a923e48750bd960f64aad248c10dd3
protected void registerGoals() {
this.goalSelector.addGoal(1, new FloatGoal(this));
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index 882c8fe0d9dc2e34eed2f1b11bb2c1b4d72319d2..c217a4b78eb53af8b8c011bfabbbddcc31c88df4 100644
index 5cd79df01d4dbe7a1af530c502a78e48dcaffb7e..9c71a3f88494d34ae02fd024f641a7af608f63fd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -120,6 +120,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -316,7 +316,7 @@ index 882c8fe0d9dc2e34eed2f1b11bb2c1b4d72319d2..c217a4b78eb53af8b8c011bfabbbddcc
public Map<String, Vector3f> getModelRotationValues() {
return this.modelRotationValues;
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 85a557b50498bb83eeec4125aa2ae14f3bfaaab8..f44261137f12354640170206ca7bfb6d991dc7a0 100644
index 909d32553ffd7a32f44f7201fdab850e4bcfdcc7..bfdd33beb8206c8b0c96aad5b5002c8db02ae912 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
@@ -91,6 +91,10 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@@ -394,7 +394,7 @@ index 92339f5a07dcb6bf7eb1bce6d584464ebd8430b5..0251ded48eb5bdf96f0e67f6456aa159
protected void randomizeAttributes(RandomSource random) {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
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 15a08abe94cb97de1450ff42cfb924a537b9eb5c..1c0d0f14659e0a64e6b3b3998f59f90cd5b59726 100644
index 7b329fa3af99742d83eca7825e2da3b6e55431ee..6045f29c641d1958371c77701e9514d9ca44b85e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -140,6 +140,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V