Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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:
5059ada Move log message for named entity deaths into correct location (#6105)
b5be382 Add methods to ProtoWorld for working with BlockStates (#5929)
144e5f7 Add option for logging named entity deaths (#6107)
4aef035 [ci skip] Use Java toolchain for run tasks (#6108)
dafc064 Fix MobEffectArgument#getEffect reobf
648f607 Route sign run_command click events through normal chat logic (#6109)
351a2c3 Drop no longer needed patch (#6115)
bb44da8 Fix cancelling EntityPickupItemEvent for villagers (#6091)
This commit is contained in:
William Blake Galbreath
2021-07-07 14:50:53 -05:00
parent afab9a73ef
commit 444413bba6
15 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
mcVersion = 1.17.1
packageVersion = 1_17_R1
paperCommit = f8d6cbdfe50fb003389d1ffd2e910caa54e4a006
paperCommit = bb44da8420a5300c53e63843da8e7bb44cf45d2a
org.gradle.parallel = true
org.gradle.vfs.watch = false

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

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index 5540da58e66f83b283863d3158a9b4ab5ba636db..ab8de6c4e3c0bea2b9f498da00adf88e987d2364 100644
index 4605634d1e0d2c6592d4152e697680e078380868..bc85e4da98322426f3f4a784fafe1c96eaea00f5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,16 @@
@@ -48,7 +48,7 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..ab8de6c4e3c0bea2b9f498da00adf88e
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -82,7 +88,7 @@ tasks.jar {
@@ -80,7 +86,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -57,7 +57,7 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..ab8de6c4e3c0bea2b9f498da00adf88e
"Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -107,6 +113,22 @@ publishing {
@@ -105,6 +111,22 @@ publishing {
}
}
@@ -80,7 +80,7 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..ab8de6c4e3c0bea2b9f498da00adf88e
val generatePom = tasks.named<GenerateMavenPom>("generatePomFileForMavenPublication")
tasks.shadowJar {
@@ -178,7 +200,7 @@ tasks.test {
@@ -176,7 +198,7 @@ tasks.test {
fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {

6
patches/server/0002-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index ab8de6c4e3c0bea2b9f498da00adf88e987d2364..f88ade92a25cb5eda7abc658551a42318af66ce9 100644
index bc85e4da98322426f3f4a784fafe1c96eaea00f5..0d971614da332d4715f5a7b3ae822bf28393944d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -36,8 +36,8 @@ repositories {
@@ -25,9 +25,9 @@ index ab8de6c4e3c0bea2b9f498da00adf88e987d2364..f88ade92a25cb5eda7abc658551a4231
implementation("io.netty:netty-all:4.1.65.Final") // Paper
+ implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning
implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
@@ -88,7 +89,7 @@ tasks.jar {
@@ -86,7 +87,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",

10
patches/server/0005-Ridables.patch
View File

@@ -201,7 +201,7 @@ index d28cecd9bea7c82fa675d333810e2e63a91c615e..8f8bc29d847801938e251904b8334b4b
protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ed745776316c5346ee1b44c8f022c40359b7e642..911a6f63e8ffeacc95fa49cdf99140c1ce3d06b1 100644
index 92fd98540e8d5ada4eaaf83bee8cdd276c4458a7..38b1919c4e725879521c31c0edb8cdf8409edb83 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -220,9 +220,9 @@ public abstract class LivingEntity extends Entity {
@@ -217,7 +217,7 @@ index ed745776316c5346ee1b44c8f022c40359b7e642..911a6f63e8ffeacc95fa49cdf99140c1
protected int lerpSteps;
protected double lerpX;
protected double lerpY;
@@ -2567,7 +2567,7 @@ public abstract class LivingEntity extends Entity {
@@ -2570,7 +2570,7 @@ public abstract class LivingEntity extends Entity {
return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D;
}
@@ -226,7 +226,7 @@ index ed745776316c5346ee1b44c8f022c40359b7e642..911a6f63e8ffeacc95fa49cdf99140c1
double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
Vec3 vec3d = this.getDeltaMovement();
@@ -3221,8 +3221,10 @@ public abstract class LivingEntity extends Entity {
@@ -3224,8 +3224,10 @@ public abstract class LivingEntity extends Entity {
this.pushEntities();
this.level.getProfiler().pop();
// Paper start
@@ -239,7 +239,7 @@ index ed745776316c5346ee1b44c8f022c40359b7e642..911a6f63e8ffeacc95fa49cdf99140c1
Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
@@ -3232,6 +3234,21 @@ public abstract class LivingEntity extends Entity {
@@ -3235,6 +3237,21 @@ public abstract class LivingEntity extends Entity {
absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
}
}
@@ -4390,7 +4390,7 @@ index af579b2b6f6e18da70e67ce74431a57d9a1236dd..d01a8fe6dd5c84ea5b7370a90c0d5713
this.level.getProfiler().pop();
PiglinBruteAi.updateActivity(this);
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index dce94c04d20af637860559c1f27412d151e1b5af..32ae046d573d5625fdb44b690d1e7e229f8aff08 100644
index eaefa4f5f86f1c836aa29dd64ea786baced4b34d..f0f1f16971e9a0678afdccf6dcd92d8967c35346 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -155,6 +155,23 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

4
patches/server/0014-LivingEntity-safeFallDistance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ecc06c084625c24b9ac8045b1d53e75dfffbdea5..39dfda78320bc04ffb9b4be7b34abef84d4c8eeb 100644
index ebb891dd292f4f1496bf740947b2061a1490073f..ef9cb7eba59e4a1f730cc608d7aece77de8b0e4d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity {
@@ -27,7 +27,7 @@ index ecc06c084625c24b9ac8045b1d53e75dfffbdea5..39dfda78320bc04ffb9b4be7b34abef8
if (!landedState.isAir()) {
double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
@@ -1887,7 +1888,7 @@ public abstract class LivingEntity extends Entity {
@@ -1890,7 +1891,7 @@ public abstract class LivingEntity extends Entity {
MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);

4
patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 39dfda78320bc04ffb9b4be7b34abef84d4c8eeb..16a507780822e0118f40acae1dff5606136e4806 100644
index ef9cb7eba59e4a1f730cc608d7aece77de8b0e4d..a88b37884e564303a86422cf50faadaf41b9d3f3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1704,8 +1704,10 @@ public abstract class LivingEntity extends Entity {
@@ -1707,8 +1707,10 @@ public abstract class LivingEntity extends Entity {
this.dropEquipment(); // CraftBukkit - from below
if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {

4
patches/server/0053-Fix-the-dead-lagging-the-server.patch
View File

@@ -17,10 +17,10 @@ index a12fcb4be21f32933cee916c863d6637ad87ef15..8197ad7db6ec1a750b732e597af75f41
public void absMoveTo(double x, double y, double z) {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 16a507780822e0118f40acae1dff5606136e4806..6dd8ee52c29e0df1c6d0abd547618ccedd9f4bcc 100644
index a88b37884e564303a86422cf50faadaf41b9d3f3..df6e71ee5b151b0b319defb4b9fd10858ff03bbd 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2880,7 +2880,7 @@ public abstract class LivingEntity extends Entity {
@@ -2883,7 +2883,7 @@ public abstract class LivingEntity extends Entity {
}
}

4
patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index e903fe670e50ff34187994d36a2d875d5f51bdb6..3865f16e027307f5b8b2a5617b66ffd8b9f85c60 100644
index 0c6583751e75d175338aaf411fb26baa1946a9b4..bad3b9eb0ab8612f9c80c52caff38ffe791d112c 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -1033,6 +1033,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -1029,6 +1029,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@Nullable
private IronGolem trySpawnGolem(ServerLevel world) {

4
patches/server/0066-Configurable-void-damage-height-and-damage.patch
View File

@@ -18,10 +18,10 @@ index 8197ad7db6ec1a750b732e597af75f41ab056778..b4d0df32fb9e8357ee87c779ff1228fb
&& this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
// Paper end
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 6dd8ee52c29e0df1c6d0abd547618ccedd9f4bcc..ddc469e3c431c417820461ea9cb6e9c8bbad17cd 100644
index df6e71ee5b151b0b319defb4b9fd10858ff03bbd..5e9040f72bea00d1011ebb0936ca2e26e42a44bb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2385,7 +2385,7 @@ public abstract class LivingEntity extends Entity {
@@ -2388,7 +2388,7 @@ public abstract class LivingEntity extends Entity {
@Override
protected void outOfWorld() {

4
patches/server/0072-Implement-elytra-settings.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ddc469e3c431c417820461ea9cb6e9c8bbad17cd..cb1ed54aa49a93fff15a0d72d459fd7adc037f6c 100644
index 5e9040f72bea00d1011ebb0936ca2e26e42a44bb..adca4ca2d13612503d36776ea4998cba9b038c10 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3281,7 +3281,16 @@ public abstract class LivingEntity extends Entity {
@@ -3284,7 +3284,16 @@ public abstract class LivingEntity extends Entity {
int j = i / 10;
if (j % 2 == 0) {

4
patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -145,7 +145,7 @@ index b615dc2a2127f0874775d1707e96edfb4d95b987..72ae6b3282aac806ae11b87024ee940e
brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 9a460eeb48c14590d28d071cfa5a925157e837c5..1cc8349d08ab6877a15075cf71236b7ae07314cc 100644
index 9ee0acdd5b3ce1eb5c78bd85c6732ad7f92655e2..30961a60449a20c4168c4b0a593402df3066379d 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -236,7 +236,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -157,7 +157,7 @@ index 9a460eeb48c14590d28d071cfa5a925157e837c5..1cc8349d08ab6877a15075cf71236b7a
}
brain.addActivity(Activity.CORE, VillagerGoalPackages.getCorePackage(villagerprofession, 0.5F));
@@ -989,7 +989,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -985,7 +985,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
}
public boolean hasFarmSeeds() {

8
patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3bda2f895612cb5bfd6205a675c03edc6a2270d6..fb031a1da8f1df142155ffb368ccc082da776e97 100644
index 49ecb743320aa3bfba2cd38f25ca5a37b38efe1f..9b6cfd16a15c176b144302b5c38408b88969fa50 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1678,7 +1678,7 @@ public abstract class LivingEntity extends Entity {
@@ -1681,7 +1681,7 @@ public abstract class LivingEntity extends Entity {
boolean flag = false;
if (this.dead && adversary instanceof WitherBoss) { // Paper
@@ -18,7 +18,7 @@ index 3bda2f895612cb5bfd6205a675c03edc6a2270d6..fb031a1da8f1df142155ffb368ccc082
BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 20af97629b614da792bdee2f8e450433570102f2..713b80dde1f6cf3ba516513873c949a57047a566 100644
index 2f061e2825127e4a38e261ccacf56926a2421bb0..ec916af4cace6bdbe5412cbabcbfaed5b1198b39 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -657,7 +657,7 @@ public abstract class Mob extends LivingEntity {
@@ -354,7 +354,7 @@ index 6dda5eeca4e310eceb2598322803bfafc184e9c7..3c51e6d419a244b9270119590aa29952
}
diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
index 9fb0464f74bcbb757171290ae44f4a4c7ea4d499..668724cfaf9f34fe057171b69213782a22f8013b 100644
index 2d4d59eb5a534e4c283933b734c44776b674b2eb..aad204181c4f54ee533bfe3fc04a8705b847e371 100644
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
@@ -82,7 +82,7 @@ public class FarmBlock extends Block {

4
patches/server/0162-One-Punch-Man.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man!
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index fb031a1da8f1df142155ffb368ccc082da776e97..4dd6b5745ca42a067f00d2fc24056e97b242a5f7 100644
index 9b6cfd16a15c176b144302b5c38408b88969fa50..9bf5d9c2ff3a5d3383f604151895f6182366c940 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2120,6 +2120,20 @@ public abstract class LivingEntity extends Entity {
@@ -2123,6 +2123,20 @@ public abstract class LivingEntity extends Entity {
((ServerPlayer) damagesource.getEntity()).awardStat(Stats.DAMAGE_DEALT_ABSORBED, Math.round(f2 * 10.0F));
}

4
patches/server/0207-API-for-any-mob-to-burn-daylight.patch
View File

@@ -29,7 +29,7 @@ index eea15d795475b79994c1b6ba55e862399831f960..f3304cefa0a8862ef27dcb00519a8a3b
// Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2ece26f762f9764db27bea60b63f2121d1fd4211..85d9e1d485699c375e888503b71910b39afc6988 100644
index 420a3ca6daab141a541f35154f7d7e65bed8ea54..124cee713c3a808bd9c52f105a38ce71b6c9b423 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity {
@@ -60,7 +60,7 @@ index 2ece26f762f9764db27bea60b63f2121d1fd4211..85d9e1d485699c375e888503b71910b3
}
// CraftBukkit start
@@ -3301,6 +3308,27 @@ public abstract class LivingEntity extends Entity {
@@ -3304,6 +3311,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F);
}

6
patches/server/0208-Fix-advancement-triggers-on-entity-death.patch
View File

@@ -16,10 +16,10 @@ restoring it back to the entity just before the criterion triggers run and
then finally clearing the equipment again right after the criterion is done.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 85d9e1d485699c375e888503b71910b39afc6988..b7ed8f7fec01003a5a006b8c46400e79d1aff1ae 100644
index 124cee713c3a808bd9c52f105a38ce71b6c9b423..7da1a70667c7537f2367660285d5ee80e9b6b67d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1662,10 +1662,13 @@ public abstract class LivingEntity extends Entity {
@@ -1661,10 +1661,13 @@ public abstract class LivingEntity extends Entity {
}
// Paper start
@@ -33,7 +33,7 @@ index 85d9e1d485699c375e888503b71910b39afc6988..b7ed8f7fec01003a5a006b8c46400e79
}
if (this.isSleeping()) {
@@ -2531,6 +2534,12 @@ public abstract class LivingEntity extends Entity {
@@ -2534,6 +2537,12 @@ public abstract class LivingEntity extends Entity {
@Override
public abstract void setItemSlot(EquipmentSlot slot, ItemStack stack);