mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
b850a822 SPIGOT-4526: Add conversion time API for Zombie & subclasses

CraftBukkit Changes:
38cf676e SPIGOT-4534: CreatureSpawnEvent not being called for CHUNK_GEN
b446cb5d SPIGOT-4527: Fix sponges with waterlogged blocks
6ec8ea5c SPIGOT-4526: Add conversion time API for Zombie & subclasses
c64fe508 Mappings Update
a3c2ec03 Fix missing ServerListPingEvent call for legacy pings

Spigot Changes:
1dc156ce Rebuild patches
140f654d Mappings Update
This commit is contained in:
Shane Freeder 2018-12-17 05:18:06 +00:00
parent 8ed2992da9
commit 3496f2d7e4
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
150 changed files with 1561 additions and 1504 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Spigot-API-Patches/0169-Add-more-Zombie-API.patch
View file

@ -1,18 +1,17 @@
From 46242a1697a2b7a91f5b564f7fd02ea8d1bbcc02 Mon Sep 17 00:00:00 2001
From 8fc89f6aa5cd95b3b784cefd12a6e7e4bd4db165 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 04:29:51 -0500
Subject: [PATCH] Add more Zombie API
diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
index 62923379..a6894903 100644
index 48034198..615dd990 100644
--- a/src/main/java/org/bukkit/entity/Zombie.java
+++ b/src/main/java/org/bukkit/entity/Zombie.java
@@ -48,4 +48,53 @@ public interface Zombie extends Monster {
@@ -79,4 +79,55 @@ public interface Zombie extends Monster {
* @param time new conversion time
*/
@Deprecated
public Villager.Profession getVillagerProfession();
+
void setConversionTime(int time);
+ // Paper start
+ /**
+ * Check if zombie is drowning
@ -25,7 +24,10 @@ index 62923379..a6894903 100644
+ * Make zombie start drowning
+ *
+ * @param drownedConversionTime Amount of time until zombie converts from drowning
+ *
+ * @deprecated See {@link #setConversionTime(int)}
+ */
+ @Deprecated
+ void startDrowning(int drownedConversionTime);
+
+ /**
@ -63,5 +65,5 @@ index 62923379..a6894903 100644
+ // Paper end
}
--
2.19.1
2.20.0