Paper/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch

48 lines
2.0 KiB
Diff
Raw Normal View History

2015-06-01 11:22:52 +02:00
From 3e2a02539c547a3dfbab7666902681d5b0afbe4a Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
2015-05-09 22:23:26 +02:00
index 2121438..edcb307 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
2014-11-28 02:17:45 +01:00
@@ -6,6 +6,7 @@ public class EntityOcelot extends EntityTameableAnimal {
2015-02-28 12:36:22 +01:00
private PathfinderGoalAvoidTarget<EntityHuman> bo;
private PathfinderGoalTempt bp;
+ public boolean spawnBonus = true; // Spigot
public EntityOcelot(World world) {
2014-11-28 02:17:45 +01:00
super(world);
2015-02-28 12:36:22 +01:00
@@ -230,7 +231,7 @@ public class EntityOcelot extends EntityTameableAnimal {
2014-11-28 02:17:45 +01:00
public GroupDataEntity prepare(DifficultyDamageScaler difficultydamagescaler, GroupDataEntity groupdataentity) {
groupdataentity = super.prepare(difficultydamagescaler, groupdataentity);
- if (this.world.random.nextInt(7) == 0) {
+ if (spawnBonus && this.world.random.nextInt(7) == 0) { // Spigot
for (int i = 0; i < 2; ++i) {
EntityOcelot entityocelot = new EntityOcelot(this.world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2015-04-09 05:39:59 +02:00
index a3e8d48..db0697b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2015-04-09 05:39:59 +02:00
@@ -1108,6 +1108,12 @@ public class CraftWorld implements World {
}
if (entity != null) {
+ // Spigot start
+ if (entity instanceof EntityOcelot)
+ {
+ ( (EntityOcelot) entity ).spawnBonus = false;
+ }
+ // Spigot end
if (entity instanceof EntityInsentient) {
2014-11-28 02:17:45 +01:00
((EntityInsentient) entity).prepare(getHandle().E(new BlockPosition(entity)), (GroupDataEntity) null);
}
--
2015-05-09 22:23:26 +02:00
2.1.4