Update to 1.14.2

This commit is contained in:
Spottedleaf
2019-05-27 16:01:45 -07:00
committed by Shane Freeder
parent 01670a5103
commit af021b9456
78 changed files with 552 additions and 575 deletions

View File

@@ -1,4 +1,4 @@
From af1a9fc237a515545168decf69757434f9b176aa Mon Sep 17 00:00:00 2001
From f695990b7b9ad58234ab33396e27100ad1bd0803 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
@@ -22,10 +22,10 @@ index 01202e4d53..616075569f 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 512d18a2b7..9ac9d499d5 100644
index 1400b3f44b..4119709cb8 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -578,6 +578,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -584,6 +584,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
public void onLightningStrike(EntityLightning entitylightning) {
EntityWitch entitywitch = (EntityWitch) EntityTypes.WITCH.a(this.world);