Projects >> IndustrialNorge >>83f88523ac596546bf6cf0534decb034ee84d1f2

Chunk
Conflicting content 
package org.halvors.halvors.listener;

<<<<<<< HEAD
import org.bukkit.entity.CreatureType;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
=======
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.entity.CreatureType;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Wolf;
>>>>>>> 9883c88d86ecdd39b0c6fe907948185a7bc6cb1a
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDeathEvent;
Solution content 
package org.halvors.halvors.listener;

import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.entity.CreatureType;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Wolf;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDeathEvent;
File
EntityListener.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		if (!event.isCancelled()) {
			CreatureType type = event.getCreatureType();
			
<<<<<<< HEAD
			if (disabledCreatures(type)) {
				
=======
			// Prevent creatures that not is set allowed to spawn.
			if (!CreatureUtils.isAllowed(type)) {
				event.setCancelled(true);
>>>>>>> 9883c88d86ecdd39b0c6fe907948185a7bc6cb1a
			}
		}
	}
Solution content 
		if (!event.isCancelled()) {
			CreatureType type = event.getCreatureType();
			
			// Prevent creatures that not is set allowed to spawn.
			if (!CreatureUtils.isAllowed(type)) {
				event.setCancelled(true);
			}
		}
	}
File
EntityListener.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation