Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Restore 0129-Optimize-World.isLoaded-BlockPosition-Z.patch

Browse Source
This commit is contained in:
Shane Freeder
2019-12-16 02:58:10 +00:00
parent 16071c7e1a
commit c47cf32c7c
290 changed files with 1073 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch Normal file
View File

@@ -0,0 +1,34 @@
From e821e56f5cb1608df4fceead00f1b947c808d63b Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Jul 2018 01:59:59 -0500
Subject: [PATCH] PlayerElytraBoostEvent
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
index 76b253a50d..a43e52889f 100644
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -36,11 +36,16 @@ public class ItemFireworks extends Item {
// Paper start
final EntityFireworks entityfireworks = new EntityFireworks(world, itemstack, entityhuman);
entityfireworks.spawningEntity = entityhuman.getUniqueID();
- world.addEntity(entityfireworks);
- // Paper end
- if (!entityhuman.abilities.canInstantlyBuild) {
- itemstack.subtract(1);
+ // Paper start
+ com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Firework) entityfireworks.getBukkitEntity());
+ if (event.callEvent() && world.addEntity(entityfireworks)) {
+ if (event.shouldConsume() && !entityhuman.abilities.canInstantlyBuild) {
+ itemstack.subtract(1);
+ } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
+ } else if (entityhuman instanceof EntityPlayer) {
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
}
+ // Paper end
}
return InteractionResultWrapper.a(entityhuman.b(enumhand));
--
2.24.1