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

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:
0399d9d6 SPIGOT-5341: Add Material.isAir
547f5709 SPIGOT-5353: Expand explosion API by adding source entity

CraftBukkit Changes:
7deb3728 SPIGOT-5309: Call cancelled EntityDamageEvent when damaging invisible armor stands
46351e17 SPIGOT-5341: Add Material.isAir
683bae06 SPIGOT-5342: Lore lost when deserializing items with no version stored
c2d12011 SPIGOT-5353: Expand explosion API by adding source entity
This commit is contained in:
Shane Freeder
2019-10-08 19:37:02 +01:00
parent 3398704d7f
commit e8c82f4eee
30 changed files with 196 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 336ebd0ca73ac288512ec519770bc0f371b811a7 Mon Sep 17 00:00:00 2001
From cab0f672ad4486733d5c31352b443b59ad4572ab 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 ee5bfd6f0..7136e274a 100644
index ee5bfd6f0c..7136e274af 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -167,6 +167,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index ee5bfd6f0..7136e274a 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 89065deb4..dcd02930d 100644
index 89065deb4f..dcd02930d9 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -693,6 +693,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,10 +39,10 @@ index 89065deb4..dcd02930d 100644
entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
entitywitch.setNoAI(this.isNoAI());
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 4623201ee..aa0048b57 100644
index 7936180b47..9af320a562 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1018,6 +1018,14 @@ public class CraftEventFactory {
@@ -1040,6 +1040,14 @@ public class CraftEventFactory {
return event;
}