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:
8ccb7fd67 Add and implement cancellable TargetHitEvent for when Target Blocks are hit by Projectiles
0507b5d7f [Auto] Updated Upstream (CraftBukkit)
1c2571224 [CI-SKIP] [Auto] Rebuild Patches
2b312dfbe Add OBSTRUCTED result to BedEnterResult enum
a5201ac98 [CI-SKIP] [Auto] Rebuild Patches
fb7503399 added PlayerTradeEvent
This commit is contained in:
jmp
2020-12-29 11:49:13 -08:00
parent 77373ea42e
commit 7194a1684a
12 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0064-Villagers-follow-emerald-blocks.patch
View File

@@ -23,10 +23,10 @@ index 171e8553a339eb3c995369f274de86b824183ca6..0ab7d3441bcafae9874134c7832a4b7c
public BehaviorController<EntityVillager> getBehaviorController() {
return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
index 8971dd013498e70c4e7a6ac6a218f62e599c86b9..3e912ef9cce8ded55564dbfe61329192922b2f13 100644
index b2a76db173ae12bff2e8a7de411cb489fdb2e9c7..2a5eda6a7e67d0b8682a96552248ea4e117c1196 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
@@ -14,6 +14,8 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -17,6 +17,8 @@ import io.papermc.paper.event.player.PlayerTradeEvent;
public abstract class EntityVillagerAbstract extends EntityAgeable implements NPC, IMerchant {