Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
1c446c22 Fix CME when adding a passenger during Spawn events (#4616)
f3927b25 Fix "Not a string" Map Conversion spam - Fixes #3901
1b64536b Clarify the JavaDocs for Entity.getEntitySpawnReason() in response to #4361
6b22219c Remove unnecessary space for provided plugins, fixes #4608
3ece9036 [CI-SKIP] [Auto] Rebuild Patches
551fac7e Fix deop kicking non-whitelisted player when white list is not enabled
faf8eb03 Updated Upstream (CraftBukkit) (#4622)
This commit is contained in:
William Blake Galbreath
2020-10-10 16:41:13 -05:00
parent 86a07695dc
commit d652384e4a
44 changed files with 52 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/server/0109-DragonEggPlaceEvent.patch Normal file
View File

@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jul 2020 18:15:13 -0500
Subject: [PATCH] DragonEggPlaceEvent
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index 4f3f7cb421..f29edc4108 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -359,7 +359,13 @@ public class EnderDragonBattle {
this.generateExitPortal(true);
this.n();
if (this.world.purpurConfig.enderDragonAlwaysDropsEggBlock || !this.previouslyKilled) { // Purpur - always place dragon egg
- this.world.setTypeUpdate(this.world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a), Blocks.DRAGON_EGG.getBlockData());
+ // Purpur start
+ BlockPosition pos = this.world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a);
+ net.pl3x.purpur.event.block.DragonEggPlaceEvent event = new net.pl3x.purpur.event.block.DragonEggPlaceEvent(MCUtil.toLocation(world, pos));
+ if (event.callEvent()) {
+ this.world.setTypeUpdate(MCUtil.toBlockPosition(event.getLocation()), Blocks.DRAGON_EGG.getBlockData());
+ }
+ // Purpur end
}
this.previouslyKilled = true;