forked from YatopiaMC/Yatopia
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated Upstream and Sidestream(s) (Paper/Purpur/Empirecraft)
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 525d0e3d3 fix beacon activate/deactivate events (#5646) e403d6aaf [Auto] Updated Upstream (CraftBukkit) 6bcd8b57c Updated Upstream (CraftBukkit) (#5742) 501cc9448 Reset villager inventory on cancelled pickup event (#5738) Purpur Changes: 687936be Updated Upstream (Paper) 4c2d7e56 Fix advancement triggers on entity death 49a0fb90 Fix oversized shulker box dupe e92d259e Fix raid captains not giving voluntary exile advancement a97fdc48 Config to broadcast the death message to the affected player (YatopiaMC#363) 9bf8e165 Add burn in daylight API for LivingEntity (YatopiaMC#331) 96460068 Fix dupe bug caused by SPIGOT-6452 2618c24f Revert "allow disabling offline mode message on an ONLINE MODE proxy" Empirecraft Changes: 12009c31 Updated Paper
- Loading branch information
Showing
86 changed files
with
909 additions
and
415 deletions.
There are no files selected for viewing
Submodule Paper
updated
13 files
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
76 changes: 0 additions & 76 deletions
76
patches/Airplane/patches/server/0034-Use-raw-iterator-where-possible.patch
This file was deleted.
Oops, something went wrong.
140 changes: 0 additions & 140 deletions
140
patches/Empirecraft/patches/server/0002-Fix-Bukkit.createInventory-with-type-LECTERN.patch
This file was deleted.
Oops, something went wrong.
File renamed without changes.
48 changes: 48 additions & 0 deletions
48
patches/Purpur/patches/api/0040-API-for-any-mob-to-burn-daylight.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Ben Kerllenevich <[email protected]> | ||
Date: Tue, 25 May 2021 16:30:30 -0400 | ||
Subject: [PATCH] API for any mob to burn daylight | ||
|
||
Co-authored by: Encode42 <[email protected]> | ||
|
||
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java | ||
index 7fa5242bd44c9b19648d79fa8fecbb7ee125288e..62d8d7dbd4d602ca8cb00ff0cf1331583b398323 100644 | ||
--- a/src/main/java/org/bukkit/entity/Entity.java | ||
+++ b/src/main/java/org/bukkit/entity/Entity.java | ||
@@ -770,5 +770,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent | ||
* @return Whether the entity was successfully spawned. | ||
*/ | ||
boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason); | ||
+ | ||
+ /** | ||
+ * Checks if the entity is in daylight | ||
+ * | ||
+ * @return True if in daylight | ||
+ */ | ||
+ boolean isInDaylight(); | ||
// Purpur end | ||
} | ||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java | ||
index 42811d18ff304082f74f45794344891208599c04..ebe10b5612835d22dfcf8b30b0f028022e47216e 100644 | ||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java | ||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java | ||
@@ -872,5 +872,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource | ||
* @param slot Equipment slot to play break animation for | ||
*/ | ||
void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot); | ||
+ | ||
+ /** | ||
+ * If this mob will burn in the sunlight | ||
+ * | ||
+ * @return True if mob will burn in sunlight | ||
+ */ | ||
+ boolean shouldBurnInDay(); | ||
+ | ||
+ /** | ||
+ * Set if this mob should burn in the sunlight | ||
+ * | ||
+ * @param shouldBurnInDay True to burn in sunlight | ||
+ */ | ||
+ void setShouldBurnInDay(boolean shouldBurnInDay); | ||
// Purpur end | ||
} |
Oops, something went wrong.