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

Add village raid spawn reason

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-29 23:39:27 -05:00
parent 918bc86c77
commit cd22a77dbd
2 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patches/api/0009-Add-village-raid-spawn-reason.patch Normal file
View File

@@ -0,0 +1,29 @@
From 38fc23f121ddbb18c56c79ab52be2553203d7ba9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 29 May 2019 23:38:50 -0500
Subject: [PATCH] Add village raid spawn reason
---
.../java/org/bukkit/event/entity/CreatureSpawnEvent.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
index 161ea7f5..784f29f8 100644
--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
@@ -95,6 +95,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
* When a zombie is spawned to invade a village
*/
VILLAGE_INVASION,
+ // Purpur start
+ /**
+ * When an entity is spawned to raid a village
+ */
+ VILLAGE_RAID,
+ // Purpur end
/**
* When an animal breeds to create a child
*/
--
2.20.1

34
patches/server/0024-Add-village-raid-spawn-reason.patch Normal file
View File

@@ -0,0 +1,34 @@
From 3950cb7d0630fe42b19a6873461f2e944de97075 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(-)
diff --git a/src/main/java/net/minecraft/server/Raid.java b/src/main/java/net/minecraft/server/Raid.java
index ba19b1d51..1484f39f1 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);
entityraider.a(i, false);
entityraider.onGround = true;
- this.l.addEntity(entityraider);
+ this.l.addEntity(entityraider, CreatureSpawnEvent.SpawnReason.VILLAGE_RAID); // Purpur
}
}
--
2.20.1