Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Purpur)

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

Purpur Changes:
PurpurMC/Purpur@db11753 Fix NPE when no world given to explosions (#1286)
This commit is contained in:
github-actions[bot]
2023-03-14 20:54:30 +00:00
parent 83645bc469
commit 77ae467bae
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.upstream-data
View File

@@ -1,2 +1,2 @@
purpurCommit = 8c8c18bb2156401882b95a4411462907c1287278
pufferfishCommit = 52307ae220ad5a9a01ac4e273b921f3cbb097de5
purpurCommit = db11753bb63a2cd43415bb599d9730f3322cbe34
pufferfishCommit = 47c34ca04781a2a9d26ba8818146341339d2414f

2
patches/api/0001-Pufferfish-API-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 20:49:53 +0000
Date: Tue, 14 Mar 2023 20:49:53 +0000
Subject: [PATCH] Pufferfish API Changes
Original: Kevin Raneri <kevin.raneri@gmail.com>

2
patches/api/0002-Purpur-API-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 20:51:35 +0000
Date: Tue, 14 Mar 2023 20:51:38 +0000
Subject: [PATCH] Purpur API Changes
Original: PurpurMC

2
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 20:49:53 +0000
Date: Tue, 14 Mar 2023 20:49:53 +0000
Subject: [PATCH] Pufferfish Server Changes
Original: Kevin Raneri <kevin.raneri@gmail.com>

12
patches/server/0002-Purpur-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 20:51:35 +0000
Date: Tue, 14 Mar 2023 20:51:38 +0000
Subject: [PATCH] Purpur Server Changes
Original: PurpurMC
@@ -10352,7 +10352,7 @@ index 500500468c12d1d44ea6b83a9176b470a954f59a..d542652d376a790c817e09921a432ee8
this.onDestroyedBy(source);
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index c7caaebfb4b9f28cbe700d88fdcf232a500e8ca7..84b230d979a91dd776e180e5b828b26bdc98ef12 100644
index c7caaebfb4b9f28cbe700d88fdcf232a500e8ca7..d5aeaac49fcbc32d5276168d910f9e298ae97fd7 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -98,14 +98,16 @@ public class EnderDragon extends Mob implements Enemy {
@@ -10369,7 +10369,7 @@ index c7caaebfb4b9f28cbe700d88fdcf232a500e8ca7..84b230d979a91dd776e180e5b828b26b
public EnderDragon(EntityType<? extends EnderDragon> entitytypes, Level world) {
super(EntityType.ENDER_DRAGON, world);
+ this.explosionSource = new Explosion(this.level, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY); // Purpur - moved instantiation from field
+ this.explosionSource = new Explosion(world, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY); // Purpur - moved instantiation from field
this.subEntities = new EnderDragonPart[]{this.head, this.neck, this.body, this.tail1, this.tail2, this.tail3, this.wing1, this.wing2};
this.setHealth(this.getMaxHealth());
this.noPhysics = true;
@@ -17201,7 +17201,7 @@ index 3b959f42d958bf0f426853aee56753d6c455fcdb..d17abb283ea818244df0379d6b57fc63
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index 5ef6b5ad4dd69a57595914c7af8422ee2f6ad054..0b572fab7b282676233e4f61aa357f1bfcfcfad1 100644
index 5ef6b5ad4dd69a57595914c7af8422ee2f6ad054..d5a7ac1a0b5308a30ab6bdfb401e8cc517926305 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -86,7 +86,7 @@ public class Explosion {
@@ -17209,7 +17209,7 @@ index 5ef6b5ad4dd69a57595914c7af8422ee2f6ad054..0b572fab7b282676233e4f61aa357f1b
this.level = world;
this.source = entity;
- this.radius = (float) Math.max(power, 0.0); // CraftBukkit - clamp bad values
+ this.radius = (float) (world.purpurConfig.explosionClampRadius ? Math.max(power, 0.0) : power); // CraftBukkit - clamp bad values // Purpur
+ this.radius = (float) (world == null || world.purpurConfig.explosionClampRadius ? Math.max(power, 0.0) : power); // CraftBukkit - clamp bad values // Purpur
this.x = x;
this.y = y;
this.z = z;
@@ -17218,7 +17218,7 @@ index 5ef6b5ad4dd69a57595914c7af8422ee2f6ad054..0b572fab7b282676233e4f61aa357f1b
public void explode() {
// CraftBukkit start
- if (this.radius < 0.1F) {
+ if (this.level.purpurConfig.explosionClampRadius && this.radius < 0.1F) { // Purpur
+ if ((this.level == null || this.level.purpurConfig.explosionClampRadius) && this.radius < 0.1F) { // Purpur
return;
}
// CraftBukkit end

4
patches/server/0006-Plazma-Optimize-Default-Configurations.patch
View File

@@ -199,10 +199,10 @@ index 4532f3a0d74feae0a1249b53e1bfbc18a8808b32..1727fdad3f92d570e159bf169e3ac4b2
public float maxLeashDistance = 10f;
public boolean disableSprintInterruptionOnAttack = false;
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index e4f991c3db75962b11aea96e9a5e29153e212342..982211091b7fb322a20c44d19f3d242ec5713ed4 100644
index a3c79863717d7eef1261f475d797ae9dda251bcb..908d25612c680e3102a0de9e0187a5bb79de6a3b 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -146,7 +146,7 @@ public class Main {
@@ -143,7 +143,7 @@ public class Main {
File configFile = (File) optionset.valueOf("bukkit-settings");
YamlConfiguration configuration = YamlConfiguration.loadConfiguration(configFile);
configuration.options().copyDefaults(true);