Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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@ef0e5a6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2022-09-13 17:32:56 -05:00
parent 664774af5a
commit 6e7bb8323f
40 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0183-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 1ffcadeb8750bac1bd2c6aabc0fd93f571f78621..f67fe200b6d748af909593e6cafdedc66cf3c005 100644
index 8d97593403198941ff6775dd8576a0e4ea8eb83e..4e5b2704f22ac8e94c8ec3b7bfe1e755207eb8cb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4597,5 +4597,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4611,5 +4611,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean canSaveToDisk() {
return true;
}
@@ -31,7 +31,7 @@ index 1ffcadeb8750bac1bd2c6aabc0fd93f571f78621..f67fe200b6d748af909593e6cafdedc6
// 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 6bca2188af3c2dadd2a3690b0ce0d8e3c2963c26..eed05f643f06540e61e8b9b966db571ea8311b74 100644
index 2b072a5e49c7dfa9b99002d82050929c5562a2e5..efb1cd7b9af8d84fd91d4e355b8092b2eb90ee58 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 {
@@ -62,7 +62,7 @@ index 6bca2188af3c2dadd2a3690b0ce0d8e3c2963c26..eed05f643f06540e61e8b9b966db571e
}
// CraftBukkit start
@@ -3482,6 +3489,27 @@ public abstract class LivingEntity extends Entity {
@@ -3504,6 +3511,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F);
}
@@ -91,10 +91,10 @@ index 6bca2188af3c2dadd2a3690b0ce0d8e3c2963c26..eed05f643f06540e61e8b9b966db571e
public boolean isSensitiveToWater() {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index f1ff212f419bb8f21c692c2174c32fab9ce91305..34db1bd524bb97fbbe0f86b088a2ac343e730f5e 100644
index 5a83abf504ca785a15d3ae0142a88e08a991e204..9ae5053c9c6591bdd8349e434ef505e64048b881 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1679,17 +1679,7 @@ public abstract class Mob extends LivingEntity {
@@ -1685,17 +1685,7 @@ public abstract class Mob extends LivingEntity {
}
public boolean isSunBurnTick() {
@@ -351,10 +351,10 @@ index cfecf0322ea22b42fa83bafe3cd2f5d74f0d1311..da2f736bd162a1e2e39473a963ef20bc
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 7bbddc36be634744c98a4ce1d1e71f2691af4535..8a728818913ec4eae440ef75efa55b84d2b94ccf 100644
index 7bca861c3ebfc7550b82ae74483464b11f8d6b55..b6e0d832a5685fd6105c5307015d58a2d7900221 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -203,6 +203,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -205,6 +205,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entity = entity;
}
@@ -367,10 +367,10 @@ index 7bbddc36be634744c98a4ce1d1e71f2691af4535..8a728818913ec4eae440ef75efa55b84
/*
* 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 5f56484f3d9351f401a9b297605823689cce57fa..fefed2988a9dc83f4e69d4c667e216b47388b909 100644
index 5188830602225f072995692098fbcb8222067935..99130bd07607b54fb7c2a40f43d5d96bd81b56fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -942,5 +942,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -983,5 +983,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}