mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 8fe5611 Fix Player#playerListName nullability annotation (#6089) 8827886 Add back linking to Adventure Javadoc (#6088) 6ea4da4 AbstractSkeleton should extend RangedEntity (#6087) a831634 add Optimize Light Engine patch (#5863) 56fd1a2 Update to Minecraft 1.17.1 (#6097) f8d6cbd Deobfuscate stacktraces in sync load info (#6103) Tuinity Changes: 5065deb Make CollisionContext initialisation lazy 388bdf5 Optimise ActivationRange#activateEntities again 2310a94 Update to 1.17.1
This commit is contained in:
@@ -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 7fae7966027d19dd9757b4761401c21d81f051ac..936213c774400c5fc6f7e28cbaafb79c67ddf3e7 100644
|
||||
index eea15d795475b79994c1b6ba55e862399831f960..f3304cefa0a8862ef27dcb00519a8a3b9b94da26 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -4079,5 +4079,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
@@ -4272,5 +4272,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
public boolean canSaveToDisk() {
|
||||
return true;
|
||||
}
|
||||
@@ -89,10 +89,10 @@ index 2ece26f762f9764db27bea60b63f2121d1fd4211..85d9e1d485699c375e888503b71910b3
|
||||
|
||||
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 9e144b0e3838b371d9fe6d146bc171f6e70e25b2..9fdc2fb0144db68868e09cf0b1dd19305fc91a50 100644
|
||||
index 2b8f2b72b3f1f3766436c41487ec8ecab350349a..ab55aa6f5717d191d0afb2da357178b294bad40e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
@@ -1630,17 +1630,7 @@ public abstract class Mob extends LivingEntity {
|
||||
@@ -1635,17 +1635,7 @@ public abstract class Mob extends LivingEntity {
|
||||
}
|
||||
|
||||
public boolean isSunBurnTick() {
|
||||
@@ -333,10 +333,10 @@ index 7eed6c176345c766a99d4304d61d28354291960f..40f2fd62b1d36843c5539932d2fb2496
|
||||
// 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 e2b1574af471699f93956130b50268647f24e0b9..c5733b0d9d4de696421a30b5d7266334af004c3b 100644
|
||||
index 1035e023003521574a09fdea3fd08e5fca66d8fc..7484f9c13e41f9be305134595b7052dfff4d72c3 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -1240,5 +1240,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@@ -1249,5 +1249,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
entity.absMoveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
|
||||
return !entity.valid && entity.level.addEntity(entity, spawnReason);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user