mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Auto] Updated Upstream (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

CraftBukkit Changes:
812f66aa SPIGOT-4684: Update persistence of converting zombie villagers
This commit is contained in:
Aikar 2019-04-08 06:31:50 -04:00
parent c36f206209
commit 2cb75d6cce
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/0303-EntityTransformedEvent.patch
View file

@ -1,4 +1,4 @@
From 4e5f302df9ea3d56f12f2ce4eff4531e39f99c36 Mon Sep 17 00:00:00 2001
From 9bc9364e7302259806103f562cccd56e0b88b9c4 Mon Sep 17 00:00:00 2001
From: Anthony MacAllister <anthonymmacallister@gmail.com>
Date: Thu, 26 Jul 2018 15:30:03 -0400
Subject: [PATCH] EntityTransformedEvent
@ -49,10 +49,10 @@ index 7a943a6c2..7998b80c1 100644
this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
index c6198626a..86e5fbcda 100644
index 670e38eb8..359ac8b88 100644
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -139,6 +139,7 @@ public class EntityZombieVillager extends EntityZombie {
@@ -140,6 +140,7 @@ public class EntityZombieVillager extends EntityZombie {
if (CraftEventFactory.callEntityTransformEvent(this, entityvillager, EntityTransformEvent.TransformReason.CURED).isCancelled()) {
return;
}

6
Spigot-Server-Patches/0389-Use-EntityTypes-for-living-entities.patch
View file

@ -1,4 +1,4 @@
From 122ff2211ce676b485e6deb97917c3828d83e3fc Mon Sep 17 00:00:00 2001
From 77e25caa3b18b13dadcc0b1deb10bc3031eb35b3 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Thu, 4 Oct 2018 10:08:02 -0500
Subject: [PATCH] Use EntityTypes for living entities
@ -433,10 +433,10 @@ index 85d402965..0cca7b6d5 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
index 86e5fbcda..fb96743af 100644
index 359ac8b88..96a1b1d3f 100644
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -118,7 +118,7 @@ public class EntityZombieVillager extends EntityZombie {
@@ -119,7 +119,7 @@ public class EntityZombieVillager extends EntityZombie {
}
protected void dJ() {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit f40143ef5e2215b15c08eac481517bd6a0cf7239
Subproject commit 812f66aa99d7ef65f29ea60690dccbcc4ccec369