Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.14.3

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-25 21:12:19 -05:00
parent 5d6c6b7efa
commit 4bc7fbcdfa
23 changed files with 444 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/server/0022-Add-village-raid-spawn-reason.patch
View File

@@ -1,31 +1,22 @@
From 4adfecc557917b0a5a882974f098d6f5fc635c05 Mon Sep 17 00:00:00 2001
From 5f33b2313df6d8637756b6e5503dcdbf36bb3e82 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 29 May 2019 23:39:04 -0500
Subject: [PATCH] Add village raid spawn reason
---
src/main/java/net/minecraft/server/Raid.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
src/main/java/net/minecraft/server/Raid.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Raid.java b/src/main/java/net/minecraft/server/Raid.java
index ba19b1d51..1484f39f1 100644
index 58c33f1000..0a796a8264 100644
--- a/src/main/java/net/minecraft/server/Raid.java
+++ b/src/main/java/net/minecraft/server/Raid.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
@@ -512,7 +514,7 @@ public class Raid {
entityraider.prepare(this.l, this.l.getDamageScaler(blockposition), EnumMobSpawn.EVENT, (GroupDataEntity) null, (NBTTagCompound) null);
@@ -524,7 +524,7 @@ public class Raid {
entityraider.prepare(this.k, this.k.getDamageScaler(blockposition), EnumMobSpawn.EVENT, (GroupDataEntity) null, (NBTTagCompound) null);
entityraider.a(i, false);
entityraider.onGround = true;
- this.l.addEntity(entityraider);
+ this.l.addEntity(entityraider, CreatureSpawnEvent.SpawnReason.VILLAGE_RAID); // Purpur
- this.k.addEntity(entityraider);
+ this.k.addEntity(entityraider, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.VILLAGE_RAID); // Purpur
}
}