Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-27 02:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Resolving minor merge conflict.

Browse Source
This commit is contained in:
Glitchfinder 2013-01-08 15:27:59 -08:00
commit e5592c5da8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/skills/archery/Archery.java
View File

@ -56,12 +56,12 @@ public class Archery {
* @param entity The entity hit by the arrows
*/
public static void arrowRetrievalCheck(LivingEntity livingEntity) {
for (Iterator<TrackedEntity> it = trackedEntities.iterator() ; it.hasNext() ; ) {
TrackedEntity trackedEntity = it.next();
for (Iterator<TrackedEntity> entityIterator = trackedEntities.iterator(); entityIterator.hasNext(); ) {
TrackedEntity trackedEntity = entityIterator.next();
if (trackedEntity.getLivingEntity() == livingEntity) {
if (trackedEntity.getLivingEntity().getEntityId() == livingEntity.getEntityId()) {
Misc.dropItems(livingEntity.getLocation(), new ItemStack(Material.ARROW), trackedEntity.getArrowCount());
it.remove();
entityIterator.remove();
return;
}
}

4
src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
View File

@ -403,14 +403,14 @@ public class Fishing {
}
break;
case SQUID:
case SQUID:
ItemStack item;
try {
item = (new MaterialData(Material.INK_SACK, DyeColor.BLACK.getDyeData())).toItemStack(1);
}
catch(Exception e) {
item = (new MaterialData(Material.INK_SACK, (byte) 0)).toItemStack(1);
}
}
Misc.dropItem(location, item);
break;