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 & Pufferfish)

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

Paper Changes:
PaperMC/Paper@9797f08 Sync Starlight SaveUtil with 1.1.1
PaperMC/Paper@ed9cf5c Fix missing null check in ChunkGenerator#findNearestMapStructure
PaperMC/Paper@fb2c24b Updated Upstream (Bukkit/CraftBukkit) (#8015)

Pufferfish Changes:
pufferfish-gg/Pufferfish@892ec46 Fix minecart loading bug. PurpurMC/Purpur#1008
pufferfish-gg/Pufferfish@8780a38 Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2022-06-20 23:09:28 -05:00
parent def1bd407d
commit 4f47e9c368
19 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0008-Ridables.patch
View File

@@ -34,7 +34,7 @@ index 7b3b8c20b5c33804753e55324651f5fbe69e231e..ef30cc43c89594a1d42c1ca4b20b5489
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 96d1af76aec13b07f91c2168fbdfa8740175f3db..9a6f462bbd604045590b850ef0d5371e04ae6a28 100644
index 9bcea650735472d446df4663e49307855415e323..9fccf684d88014714b7468da41b937648e1a3e32 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -218,6 +218,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -194,7 +194,7 @@ index c1e9b40a4a0f9cdc650caa88b5ea132e06ee2496..882ab40c8cdea8c214cb8344b3ccecdd
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 39fab6a5195e32ae6ffc9988e6fcecfe96be2f76..14444b86758912e9938026178ac3ba4e16e3b966 100644
index 8a9b6cacfb87d4ba825f3386894c25631ecbb1f7..70846a6b4674bcb9bd95e933e32812c19e4a5a54 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 {
@@ -2767,7 +2767,7 @@ index 305a891e4b51d1031d9e9238ff00e2ea7de8d954..84625d09df800fcfd477fc493fb5f824
protected void defineSynchedData() {
}
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 219877901fb5fc6401646253d6e5d7bd8416ffe1..079a85f1520cda6a0fb72d0dd7f9e18aec6a6c91 100644
index 47d6236daca806878399890a8d08e55233f19fd9..0876034f2735af2b143112162b38a5bfd71139bb 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
@@ -103,6 +103,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -5160,7 +5160,7 @@ index 5b92c2ca03baed38f7d41a73fae7dd23ce541d43..3cc9dab362141fdf61bdcd542ffa5e5c
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 1d8ec0f85ec42f2dcd9405df83b526ae1c59de6f..d437630610b3561029a88a075ab3ed0ad3abcfe2 100644
index 03d389f3458cd77166a0319fa38c7207e8714e6f..cc0f6a51e10c77928fccf372a45a56aa6f2b298a 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -543,6 +543,15 @@ public class CraftEventFactory {
@@ -5179,7 +5179,7 @@ index 1d8ec0f85ec42f2dcd9405df83b526ae1c59de6f..d437630610b3561029a88a075ab3ed0a
return event;
}
@@ -979,6 +988,7 @@ public class CraftEventFactory {
@@ -980,6 +989,7 @@ public class CraftEventFactory {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
@@ -5187,7 +5187,7 @@ index 1d8ec0f85ec42f2dcd9405df83b526ae1c59de6f..d437630610b3561029a88a075ab3ed0a
}
event.setCancelled(cancelled);
@@ -1085,6 +1095,7 @@ public class CraftEventFactory {
@@ -1086,6 +1096,7 @@ public class CraftEventFactory {
} else {
entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
}
@@ -5195,7 +5195,7 @@ index 1d8ec0f85ec42f2dcd9405df83b526ae1c59de6f..d437630610b3561029a88a075ab3ed0a
return event;
}
@@ -1144,6 +1155,7 @@ public class CraftEventFactory {
@@ -1145,6 +1156,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API