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

[Auto] Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
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:
98d3f031 SPIGOT-4376: Add draft BlockDropItemEvent

CraftBukkit Changes:
1057710a SPIGOT-4376: Add draft BlockDropItemEvent
This commit is contained in:
Aikar
2018-10-31 05:01:59 -04:00
parent f840af3e2b
commit acd334793f
15 changed files with 130 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0141-Add-EntityZapEvent.patch
View File

@@ -1,11 +1,11 @@
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From bbbfb1d1d20ec895f22ede5b5709a915b1f4ba5a Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Sun, 16 Oct 2016 23:19:30 -0700
Subject: [PATCH] Add EntityZapEvent
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index fecc7e154d..b405e63e81 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -152,6 +152,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
return;
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 5e52349064..8195412806 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -610,6 +610,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,10 +48,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 7e0441e64e..e0716a6085 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -723,6 +723,14 @@ public class CraftEventFactory {
@@ -730,6 +730,14 @@ public class CraftEventFactory {
return event;
}