70 Zeilen
4.5 KiB
Diff
70 Zeilen
4.5 KiB
Diff
|
From 9f56713daf2d5371b7e443be7e205ece7106f371 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
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||
|
|
index c6babe6..a7159ef 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||
|
|
@@ -43,7 +43,7 @@ public class EntityMushroomCow extends EntityCow {
|
||
|
|
if (this.hasCustomName()) {
|
||
|
|
entitycow.setCustomName(this.getCustomName());
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+ if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), entitycow.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.SHEARED).callEvent()) return false; // Paper
|
||
|
|
this.world.addEntity(entitycow);
|
||
|
|
|
||
|
|
for (int i = 0; i < 5; ++i) {
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
|
||
|
|
index b51543e..51be546 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityVillager.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
|
||
|
|
@@ -623,7 +623,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
|
||
|
|
entitywitch.setCustomName(this.getCustomName());
|
||
|
|
entitywitch.setCustomNameVisible(this.getCustomNameVisible());
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+ if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), entitywitch.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.LIGHTNING).callEvent()) return; // Paper
|
||
|
|
this.world.addEntity(entitywitch, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // Paper - Added lightning spawn reason for this entity
|
||
|
|
this.die();
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
|
||
|
|
index 90aa864..adf314e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
||
|
|
@@ -233,7 +233,7 @@ public class EntityZombie extends EntityMonster {
|
||
|
|
entityzombie.setCustomName(this.getCustomName());
|
||
|
|
entityzombie.setCustomNameVisible(this.getCustomNameVisible());
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+ if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), entityzombie.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.DROWNED).callEvent()) return; // Paper
|
||
|
|
this.world.addEntity(entityzombie);
|
||
|
|
this.die();
|
||
|
|
}
|
||
|
|
@@ -392,6 +392,7 @@ public class EntityZombie extends EntityMonster {
|
||
|
|
entityzombievillager.setCustomNameVisible(entityvillager.getCustomNameVisible());
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), entityvillager.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.INFECTED).callEvent()) return; // Paper
|
||
|
|
this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
|
||
|
|
this.world.a((EntityHuman) null, 1026, new BlockPosition(this), 0);
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
|
||
|
|
index 9f61523..b8b0d65 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
|
||
|
|
@@ -130,7 +130,7 @@ public class EntityZombieVillager extends EntityZombie {
|
||
|
|
entityvillager.setCustomName(this.getCustomName());
|
||
|
|
entityvillager.setCustomNameVisible(this.getCustomNameVisible());
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+ if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), entityvillager.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.CURED).callEvent()) return; // Paper
|
||
|
|
this.world.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
|
||
|
|
if (this.bD != null) {
|
||
|
|
EntityHuman entityhuman = this.world.b(this.bD);
|
||
|
|
--
|
||
|
|
2.8.4.windows.1
|
||
|
|
|