Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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@0baf2ff [ci skip] Allow .git to be a regular file (#8631)
PaperMC/Paper@5e6ac3c Properly identify golem spawn reason (#8635)
PaperMC/Paper@ec772bb Rabbit API (#8627)
PaperMC/Paper@7e5f85e Updated Upstream (CraftBukkit)
PaperMC/Paper@075fb67 Add eating regain reason for Camels (#8638)
PaperMC/Paper@812efd3 Fix chunksnapshot biome getter (#8639)
PaperMC/Paper@be50d5b Readd BlockBehavior inlining patch
PaperMC/Paper@7ba81b1 [ci skip] Fix leaf'd patch names
PaperMC/Paper@5bd8e1c Fix MapLike Codec missing key 'selector' (#8634)
PaperMC/Paper@7d18c6b Don't show particles when splash events are canceled (#8637)
PaperMC/Paper@ecfb76a Fix empty effect clouds from lingering potions (#8641)
PaperMC/Paper@1143b63 Add Position (#7639)
PaperMC/Paper@0bdbcd9 [ci skip] Remove non-functioning patch
PaperMC/Paper@d8cf30d Deprecate isPreview method in decorate events (#8645)
PaperMC/Paper@a5ecfd6 [ci skip] Correct chat preview removal version in javadoc (#8646)
PaperMC/Paper@eeeb8d5 Add the non-flammable wood item tag (#8648)
PaperMC/Paper@d2cb347 Fix items equipped on AbstractHorse losing NBT (#8647)
This commit is contained in:
BillyGalbreath
2022-12-12 00:07:02 -06:00
parent 78e9a806d3
commit b7671eeee9
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0007-Configurable-entity-base-attributes.patch
View File

@@ -331,7 +331,7 @@ index 71929e5fe8851ad5620f25b6ed5058653231d769..988093b46a4c386f8d47a4c530b8e9f6
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
index 2579351192a47567a3b9a0e7653f02dcf61babb1..45f8e38bf4b4b446fe2ec056e31ffd05feaab929 100644
index db6521531517dbb06ff9aea4c1b5aa9c6bd858ac..b3bfb94529dfaa912f0e5ce0965b0740f09cf55e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
@@ -135,6 +135,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
@@ -491,7 +491,7 @@ index 9b0a0736aa46e60f21c85cc88b67af342c34d5db..ee548f48f850e65542d8b0270881ad76
@Override
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 a1f2648005f37101b641302e173eb6d6183c2773..68dd5611a3d7c943541e42b57457cf24fd2ea577 100644
index ef5f059b51e330c801e1f0d5297c62ea9b77c637..5af2254b6dd380ad0822b47292940e08092f0eeb 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
@@ -129,6 +129,32 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -527,7 +527,7 @@ index a1f2648005f37101b641302e173eb6d6183c2773..68dd5611a3d7c943541e42b57457cf24
// Purpur end
@Override
@@ -1205,7 +1231,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -1211,7 +1237,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
entityData = new AgeableMob.AgeableMobGroupData(0.2F);
}
@@ -1464,7 +1464,7 @@ index 0e7d5540763d56020cd59d9aef09f7a7d2cde1b1..7502940882edea11842b09de57094af3
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c2e8eb6b25b21ea3238c5df180e4deb8d59ab5b2..b411ba7283b8d6abf7cf53c3c82b612c801ebbee 100644
index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93e8f0a486 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -113,94 +113,166 @@ public class PurpurWorldConfig {