diff options
author | BlackHole <black-hole@live.com> | 2016-03-13 16:38:07 +0100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-03-14 16:54:38 +1100 |
commit | 87e677ce49bb27be69206d54566bf7d621108925 (patch) | |
tree | f28c6c91d40e2adadaf89ff7c71b47e5255f6c04 /nms-patches/PathfinderGoalHorseTrap.patch | |
parent | ab8459e1818b3b9f8c9998bb90daf8bd42e5d8cd (diff) | |
download | craftbukkit-87e677ce49bb27be69206d54566bf7d621108925.tar craftbukkit-87e677ce49bb27be69206d54566bf7d621108925.tar.gz craftbukkit-87e677ce49bb27be69206d54566bf7d621108925.tar.lz craftbukkit-87e677ce49bb27be69206d54566bf7d621108925.tar.xz craftbukkit-87e677ce49bb27be69206d54566bf7d621108925.zip |
Add spawn reasons for entities involved in a skeleton trap
Diffstat (limited to 'nms-patches/PathfinderGoalHorseTrap.patch')
-rw-r--r-- | nms-patches/PathfinderGoalHorseTrap.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/nms-patches/PathfinderGoalHorseTrap.patch b/nms-patches/PathfinderGoalHorseTrap.patch new file mode 100644 index 00000000..773ca83d --- /dev/null +++ b/nms-patches/PathfinderGoalHorseTrap.patch @@ -0,0 +1,37 @@ +--- a/net/minecraft/server/PathfinderGoalHorseTrap.java ++++ b/net/minecraft/server/PathfinderGoalHorseTrap.java +@@ -22,13 +22,14 @@ + this.a.world.strikeLightning(new EntityLightning(this.a.world, this.a.locX, this.a.locY, this.a.locZ, true)); + EntitySkeleton entityskeleton = this.a(difficultydamagescaler, this.a); + +- entityskeleton.startRiding(this.a); ++ if (entityskeleton != null) entityskeleton.startRiding(this.a); // CraftBukkit + + for (int i = 0; i < 3; ++i) { + EntityHorse entityhorse = this.a(difficultydamagescaler); ++ if (entityhorse == null) continue; // CraftBukkit + EntitySkeleton entityskeleton1 = this.a(difficultydamagescaler, entityhorse); + +- entityskeleton1.startRiding(entityhorse); ++ if (entityskeleton1 != null) entityskeleton1.startRiding(entityhorse); // CraftBukkit + entityhorse.g(this.a.getRandom().nextGaussian() * 0.5D, 0.0D, this.a.getRandom().nextGaussian() * 0.5D); + } + +@@ -44,7 +45,7 @@ + entityhorse.setType(EnumHorseType.SKELETON); + entityhorse.setTame(true); + entityhorse.setAgeRaw(0); +- entityhorse.world.addEntity(entityhorse); ++ if (!entityhorse.world.addEntity(entityhorse, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.TRAP)) return null; // CraftBukkit + return entityhorse; + } + +@@ -61,7 +62,7 @@ + + EnchantmentManager.a(entityskeleton.getRandom(), entityskeleton.getItemInMainHand(), (int) (5.0F + difficultydamagescaler.c() * (float) entityskeleton.getRandom().nextInt(18)), false); + EnchantmentManager.a(entityskeleton.getRandom(), entityskeleton.getEquipment(EnumItemSlot.HEAD), (int) (5.0F + difficultydamagescaler.c() * (float) entityskeleton.getRandom().nextInt(18)), false); +- entityskeleton.world.addEntity(entityskeleton); ++ if (!entityskeleton.world.addEntity(entityskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.JOCKEY)) return null; // CraftBukkit + return entityskeleton; + } + } |