Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37: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@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0187-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 66788c374deb9a499841e0b28fcf34999e55c742..542d502ad0080e20971e1fddff54504dd23b0bf1 100644
index 97e27e2824a18cfbe8bba5599102702a99f3bf11..e9c30922573745d5e5007d2d3221b62d81534fe9 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4435,5 +4435,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -4450,5 +4450,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
public boolean canSaveToDisk() {
return true;
}
@@ -29,10 +29,10 @@ index 66788c374deb9a499841e0b28fcf34999e55c742..542d502ad0080e20971e1fddff54504d
// 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 26717a4172ef299a3b4ab4384f8c23dc853bb485..12517438b8b8366a37165cb057dfc040ec81fc3a 100644
index d1ba2930cbbab31d9a1d726db1fd99295555867a..ef2efc00ebd610cf0e393b6b604c48cdac2d4bbc 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -261,6 +261,7 @@ public abstract class LivingEntity extends Entity {
@@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity {
public boolean bukkitPickUpLoot;
public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
@@ -40,7 +40,7 @@ index 26717a4172ef299a3b4ab4384f8c23dc853bb485..12517438b8b8366a37165cb057dfc040
@Override
public float getBukkitYaw() {
@@ -763,6 +764,7 @@ public abstract class LivingEntity extends Entity {
@@ -762,6 +763,7 @@ public abstract class LivingEntity extends Entity {
dataresult.resultOrPartial(logger::error).ifPresent((nbtbase) -> {
nbt.put("Brain", nbtbase);
});
@@ -48,7 +48,7 @@ index 26717a4172ef299a3b4ab4384f8c23dc853bb485..12517438b8b8366a37165cb057dfc040
}
@Override
@@ -838,6 +840,11 @@ public abstract class LivingEntity extends Entity {
@@ -837,6 +839,11 @@ public abstract class LivingEntity extends Entity {
this.brain = this.makeBrain(new Dynamic(NbtOps.INSTANCE, nbt.get("Brain")));
}
@@ -60,7 +60,7 @@ index 26717a4172ef299a3b4ab4384f8c23dc853bb485..12517438b8b8366a37165cb057dfc040
}
// CraftBukkit start
@@ -3428,6 +3435,27 @@ public abstract class LivingEntity extends Entity {
@@ -3427,6 +3434,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F);
}
@@ -349,7 +349,7 @@ index e888e630176f30d773155019fb17aed8095538a1..0e3dac205fe9d19ba7dccbd55fcc26ed
/*
* Order is *EXTREMELY* important -- keep it right! =D
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index eb61eab2b7be4f99b827a0e206db23a858fa2119..92a08935e7b1c936e8aa379b118c345b89dc23d7 100644
index 9ce256d6e1c3d502888ebe79ae672f2b4b00652e..ab5d668cf295d84663ced382cbde8dc940176470 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -937,5 +937,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {