Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27: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:
PaperMC/Paper@1845cec Fix death message containing empty string (#8656)
PaperMC/Paper@326a65e [ci skip] add missing final newline (#8659)
PaperMC/Paper@0148283 Fix locateNearestBiome nullability check (#8662)
PaperMC/Paper@3822cc8 Update paperweight to 1.4.0
PaperMC/Paper@adb8e49 Fix fire charge not being consumed igniting a creeper (#8652)
This commit is contained in:
BillyGalbreath
2022-12-13 19:50:15 -06:00
parent b7671eeee9
commit cceae2cdb3
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -2,7 +2,7 @@ plugins {
java
`maven-publish`
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.3.11"
id("io.papermc.paperweight.patcher") version "1.4.0"
}
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.3-R0.1-SNAPSHOT
paperCommit = d2cb347f714a15e638100d06e9946921c184d4a2
paperCommit = adb8e499dbc6050abf4a690d369cf506bc3ac318
org.gradle.caching = true
org.gradle.parallel = true

4
patches/server/0006-Ridables.patch
View File

@@ -3260,7 +3260,7 @@ index d980b906d9206560741576fa4153c57212f307a0..790d4abbc8e0b288e20e72e63f8190e9
public boolean doHurtTarget(Entity target) {
if (super.doHurtTarget(target)) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index 805e267090285d625dbeb75b06f8c5ad141a75a4..411baa912b61ce319faef73e187ebf7ac1bacde5 100644
index 338161d2eb15d9264027961b71678b8d2f020fd8..324173e0b97a3f5ed657f876f1723a909eb7f0da 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -59,21 +59,98 @@ public class Creeper extends Monster implements PowerableMob {
@@ -3362,7 +3362,7 @@ index 805e267090285d625dbeb75b06f8c5ad141a75a4..411baa912b61ce319faef73e187ebf7a
this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, true));
this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
}
@@ -318,6 +395,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -324,6 +401,7 @@ public class Creeper extends Monster implements PowerableMob {
com.destroystokyo.paper.event.entity.CreeperIgniteEvent event = new com.destroystokyo.paper.event.entity.CreeperIgniteEvent((org.bukkit.entity.Creeper) getBukkitEntity(), ignited);
if (event.callEvent()) {
this.entityData.set(Creeper.DATA_IS_IGNITED, event.isIgnited());

6
patches/server/0143-Config-to-make-Creepers-explode-on-death.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Config to make Creepers explode on death
Creepers exploded after being killed in the alpha days. This brings that back.
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index f4b6345777a8f48b0d156bdfa80a5207376caeaf..b6f8d2927152a8e5a1203f3d57efb436cf72b30a 100644
index 99eb17fcc112a4a770903b28fcbe1b9dfce495e2..7287d2bddc28f50987964862ce7eca1dc4d9420a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -63,6 +63,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -32,7 +32,7 @@ index f4b6345777a8f48b0d156bdfa80a5207376caeaf..b6f8d2927152a8e5a1203f3d57efb436
// Purpur end
@Override
@@ -354,6 +363,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -360,6 +369,7 @@ public class Creeper extends Monster implements PowerableMob {
}
public void explodeCreeper() {
@@ -40,7 +40,7 @@ index f4b6345777a8f48b0d156bdfa80a5207376caeaf..b6f8d2927152a8e5a1203f3d57efb436
if (!this.level.isClientSide) {
float f = this.isPowered() ? 2.0F : 1.0F;
@@ -371,7 +381,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -377,7 +387,7 @@ public class Creeper extends Monster implements PowerableMob {
}
// CraftBukkit end
}

4
patches/server/0167-Config-for-health-to-impact-Creeper-explosion-radius.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Config for health to impact Creeper explosion radius
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index b6f8d2927152a8e5a1203f3d57efb436cf72b30a..5e7dcb99daf6dcb61b8cd907d882778b48161d42 100644
index 7287d2bddc28f50987964862ce7eca1dc4d9420a..06f493349c76690e3ba38fe9add9171e4ffcfe7d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -366,9 +366,10 @@ public class Creeper extends Monster implements PowerableMob {
@@ -372,9 +372,10 @@ public class Creeper extends Monster implements PowerableMob {
this.exploding = true; // Purpur
if (!this.level.isClientSide) {
float f = this.isPowered() ? 2.0F : 1.0F;

4
patches/server/0273-Add-local-difficulty-api.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c5eb25b191cbb496be2a761d0b6eec9776319687..8e2e58ae379379808f347d503ddcfbb961c98763 100644
index f8d321e925bf2708e51590542325c1bdc67d5964..fcc6ac180a74daffa173866be3dd97a3ad63ebd7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2233,6 +2233,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2237,6 +2237,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return (this.getHandle().dragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().dragonFight());
}

4
patches/server/0283-Debug-Marker-API.patch
View File

@@ -52,10 +52,10 @@ index c77f76d3b346d25aa48233ad8516a85118f26a9f..79ee10b16295d2eafe1555331c03d455
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8e2e58ae379379808f347d503ddcfbb961c98763..069bb67d1f79e63dce85cba347a1fd67a4781043 100644
index fcc6ac180a74daffa173866be3dd97a3ad63ebd7..804f81c478c09a5b6d0b10a78dc2b7ae0b88cc18 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2237,6 +2237,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2241,6 +2241,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public float getLocalDifficultyAt(Location location) {
return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
}