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:
871f30038 fixed kick event leave message (#4766)
0aa0a1d97 Updated Upstream (CraftBukkit)
d770f71f4 Add PlayerArmSwingEvent (#5353)
23d887b2a Swapped out Vec3#distanceTo call with a Vec3#distanceToSqr call to remove calls to Math.sqrt
5ff90b938 Fix collisions during world generation (#6129)
20ff0b058 [ci skip] Add a test plugin (#6133)
416ec9898 [ci skip] Remove extra newlines at EOF (#6127)
79d7dfbbe Ensure shulker bounding box is updated (#6010)
d8ad276b7 [ci skip] More badges and things to README.md (#5338)
bb44da842 Fix cancelling EntityPickupItemEvent for villagers (#6091)
351a2c38b Drop no longer needed patch (#6115)
648f6078d Route sign run_command click events through normal chat logic (#6109)
dafc06460 Fix MobEffectArgument#getEffect reobf
4aef0354d [ci skip] Use Java toolchain for run tasks (#6108)
144e5f7ac Add option for logging named entity deaths (#6107)
b5be382d0 Add methods to `ProtoWorld` for working with `BlockState`s (#5929)
This commit is contained in:
TwoLeggedCat
2021-07-09 16:56:56 -05:00
committed by Jason
parent 444413bba6
commit 325d6c39a4
15 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0207-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 eea15d795475b79994c1b6ba55e862399831f960..f3304cefa0a8862ef27dcb00519a8a3b9b94da26 100644
index 6972880a375c60d19c03e0988e9ab9f80041d451..010a47813b2b3dbc0739c203e4186d14cc780579 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4272,5 +4272,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -4277,5 +4277,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
public boolean canSaveToDisk() {
return true;
}
@@ -29,7 +29,7 @@ index eea15d795475b79994c1b6ba55e862399831f960..f3304cefa0a8862ef27dcb00519a8a3b
// 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 420a3ca6daab141a541f35154f7d7e65bed8ea54..124cee713c3a808bd9c52f105a38ce71b6c9b423 100644
index 8484f49814940b0350d1bec6b4bb5bf6519fbb1c..a0398eef44f65eae1404e122b3086db7aa688f8a 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 {
@@ -348,7 +348,7 @@ index 1035e023003521574a09fdea3fd08e5fca66d8fc..7484f9c13e41f9be305134595b7052df
// Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 23c136ed6daf5111b97996053df18413480532e5..97d892edfed76df90c4e6294b0a3c2d43da06860 100644
index e0acfc315f80d9a5c5aa045845ccc3e00c4435c5..99ee365536304799082549d48811df436224eb64 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -889,5 +889,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {