Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-06-24 13:44:52 +02:00
Code Issues Projects Releases Wiki Activity

Update mob spawning for MC 1.10, fixes #353. Bump version number

Browse Source
This commit is contained in:
HappyPikachu 2016-06-23 21:15:00 -04:00
parent 9cc4a97ae0
commit 0d207e8321
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>me.blackvein.quests</groupId>
<artifactId>quests</artifactId>
<version>2.6.5</version>
<version>2.6.6</version>
<name>quests</name>
<url>https://github.com/FlyingPikachu/Quests/</url>
<packaging>jar</packaging>

35
src/main/java/me/blackvein/quests/util/QuestMob.java
View File

@ -1,12 +1,12 @@
package me.blackvein.quests.util;
import me.blackvein.quests.Quests;
import net.minecraft.server.v1_10_R1.EnumItemSlot;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_8_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_8_R1.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftItemStack;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
@ -102,13 +102,30 @@ public class QuestMob {
((LivingEntity) entity).setCustomNameVisible(true);
}
for (int j = 0; j < 5; j++) {
if (inventory[j] != null) {
((CraftEntity) entity).getHandle().setEquipment(j, CraftItemStack.asNMSCopy(inventory[j]));
}
try{
((CraftEntity) entity).getHandle().setEquipment(EnumItemSlot.MAINHAND, CraftItemStack.asNMSCopy(inventory[0]));
((CraftEntity) entity).getHandle().setEquipment(EnumItemSlot.FEET, CraftItemStack.asNMSCopy(inventory[1]));
((CraftEntity) entity).getHandle().setEquipment(EnumItemSlot.LEGS, CraftItemStack.asNMSCopy(inventory[2]));
((CraftEntity) entity).getHandle().setEquipment(EnumItemSlot.CHEST, CraftItemStack.asNMSCopy(inventory[3]));
((CraftEntity) entity).getHandle().setEquipment(EnumItemSlot.HEAD, CraftItemStack.asNMSCopy(inventory[4]));
} catch (Exception e) {
Bukkit.getLogger().severe("Entity NMS is invalid for this version of CraftBukkit. Please notify the developer");
e.printStackTrace();
}
/*for (int j = 0; j < 5; j++) {
if (inventory[j] != null) {
try{
((CraftEntity) entity).getHandle().setEquipment(j, CraftItemStack.asNMSCopy(inventory[j]));
} catch (Exception e) {
Bukkit.getLogger().severe("Entity NMS is invalid for this version of CraftBukkit. Please notify the developer");
e.printStackTrace();
}
}
}*/
EntityEquipment eq = ((CraftLivingEntity) entity).getEquipment();
//EntityEquipment eq = ((CraftLivingEntity) entity).getEquipment();
EntityEquipment eq = ((LivingEntity)entity).getEquipment();
if (dropChances[0] != null) {
eq.setItemInHandDropChance(dropChances[0]);