Projects >> Essentials >>6488882e1afc883281185ea930f3bb01d24f0875

Chunk
Conflicting content 
	{
		for (Player p : getServer().getOnlinePlayers())
		{
<<<<<<< HEAD
			IUser user = getUser(p);
=======
			User user = getUser(p);
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			if (user.isVanished())
			{
				user.toggleVanished();
Solution content 
	{
		for (Player p : getServer().getOnlinePlayers())
		{
			IUser user = getUser(p);
			if (user.isVanished())
			{
				user.toggleVanished();
File
Essentials.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
=======

		for (Player player : players)
		{
<<<<<<< HEAD
			final IUser user = getUser(player);
			if (!user.isIgnoringPlayer(sender))
			final User user = getUser(player);
			if (!user.isIgnoredPlayer(sender))
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			{
				player.sendMessage(message);
			}
Solution content 
		for (Player player : players)
		{
			final IUser user = getUser(player);
			if (!user.isIgnoringPlayer(sender))
			{
				player.sendMessage(message);
			}
File
Essentials.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
	{
		try
		{
<<<<<<< HEAD
			user.checkCooldown(TimestampType.LASTTELEPORT, ess.getRanks().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS);
=======
			// Take the current time, and remove the delay from it.
			final double cooldown = ess.getSettings().getTeleportCooldown();
			final Calendar earliestTime = new GregorianCalendar();
			earliestTime.add(Calendar.SECOND, -(int)cooldown);
			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
			// This value contains the most recent time a teleport could have been used that would allow another use.
			final long earliestLong = earliestTime.getTimeInMillis();

			// When was the last teleport used?
			final Long lastTime = user.getLastTeleportTimestamp();

			if (lastTime > time.getTimeInMillis())
			{
				// This is to make sure time didn't get messed up on last kit use.
				// If this happens, let's give the user the benifit of the doubt.
				user.setLastTeleportTimestamp(time.getTimeInMillis());
				return;
			}
			else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
			{
				time.setTimeInMillis(lastTime);
				time.add(Calendar.SECOND, (int)cooldown);
				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis())));
			}
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		}
		catch (CooldownException ex)
		{
Solution content 
	{
		try
		{
			user.checkCooldown(TimestampType.LASTTELEPORT, ess.getRanks().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS);
		}
		catch (CooldownException ex)
		{
File
Teleport.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
		ENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
		ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
		ENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

=======
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("arthropodsdamage", Enchantment.DAMAGE_ARTHROPODS);
		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
Solution content 
		ENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
		ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
		ENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL);

		ENCHANTMENTS.put("arthropodsdamage", Enchantment.DAMAGE_ARTHROPODS);
		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
		ENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS);
		ENCHANTMENTS.put("arthropod", Enchantment.DAMAGE_ARTHROPODS);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

=======
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD);
		ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD);
Solution content 
		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
		ENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS);
		ENCHANTMENTS.put("arthropod", Enchantment.DAMAGE_ARTHROPODS);

		ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD);
		ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
=======
		ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED);
		ENCHANTMENTS.put("minespeed", Enchantment.DIG_SPEED);
		ENCHANTMENTS.put("cutspeed", Enchantment.DIG_SPEED);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("durability", Enchantment.DURABILITY);
		ENCHANTMENTS.put("dura", Enchantment.DURABILITY);
		ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY);
Solution content 
		ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED);
		ENCHANTMENTS.put("minespeed", Enchantment.DIG_SPEED);
		ENCHANTMENTS.put("cutspeed", Enchantment.DIG_SPEED);

		ENCHANTMENTS.put("durability", Enchantment.DURABILITY);
		ENCHANTMENTS.put("dura", Enchantment.DURABILITY);
		ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
		ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT);
		ENCHANTMENTS.put("meleefire", Enchantment.FIRE_ASPECT);
		ENCHANTMENTS.put("meleeflame", Enchantment.FIRE_ASPECT);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

=======
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK);

		ENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
Solution content 
		ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT);
		ENCHANTMENTS.put("meleefire", Enchantment.FIRE_ASPECT);
		ENCHANTMENTS.put("meleeflame", Enchantment.FIRE_ASPECT);

		ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK);

		ENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
		ENCHANTMENTS.put("respiration", Enchantment.OXYGEN);
		ENCHANTMENTS.put("breathing", Enchantment.OXYGEN);
		ENCHANTMENTS.put("breath", Enchantment.OXYGEN);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

		ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL);
		ENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
		ENCHANTMENTS.put("protect", Enchantment.PROTECTION_ENVIRONMENTAL);

=======
		
		ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL);
		ENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
		ENCHANTMENTS.put("protect", Enchantment.PROTECTION_ENVIRONMENTAL);
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
		ENCHANTMENTS.put("explosionprotection", Enchantment.PROTECTION_EXPLOSIONS);
		ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
Solution content 
		ENCHANTMENTS.put("respiration", Enchantment.OXYGEN);
		ENCHANTMENTS.put("breathing", Enchantment.OXYGEN);
		ENCHANTMENTS.put("breath", Enchantment.OXYGEN);

		ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL);
		ENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
		ENCHANTMENTS.put("protect", Enchantment.PROTECTION_ENVIRONMENTAL);

		ENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
		ENCHANTMENTS.put("explosionprotection", Enchantment.PROTECTION_EXPLOSIONS);
		ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
		ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
		ENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
		ENCHANTMENTS.put("blastprotect", Enchantment.PROTECTION_EXPLOSIONS);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

=======
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
		ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL);
		ENCHANTMENTS.put("featherfall", Enchantment.PROTECTION_FALL);
Solution content 
		ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
		ENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
		ENCHANTMENTS.put("blastprotect", Enchantment.PROTECTION_EXPLOSIONS);

		ENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
		ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL);
		ENCHANTMENTS.put("featherfall", Enchantment.PROTECTION_FALL);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
		ENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE);
		ENCHANTMENTS.put("fireprotect", Enchantment.PROTECTION_FIRE);
		ENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

=======
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("projectileprotection", Enchantment.PROTECTION_PROJECTILE);
		ENCHANTMENTS.put("projprot", Enchantment.PROTECTION_PROJECTILE);
Solution content 
		ENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE);
		ENCHANTMENTS.put("fireprotect", Enchantment.PROTECTION_FIRE);
		ENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE);

		ENCHANTMENTS.put("projectileprotection", Enchantment.PROTECTION_PROJECTILE);
		ENCHANTMENTS.put("projprot", Enchantment.PROTECTION_PROJECTILE);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
		ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
		ENCHANTMENTS.put("softtouch", Enchantment.SILK_TOUCH);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

=======
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
		ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
Solution content 
		ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
		ENCHANTMENTS.put("softtouch", Enchantment.SILK_TOUCH);

		ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
		ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
		ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
		ENCHANTMENTS.put("flame", Enchantment.ARROW_FIRE);
		ENCHANTMENTS.put("flamearrow", Enchantment.ARROW_FIRE);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

		ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
		ENCHANTMENTS.put("power", Enchantment.ARROW_DAMAGE);
		ENCHANTMENTS.put("arrowpower", Enchantment.ARROW_DAMAGE);

=======
		
		ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
		ENCHANTMENTS.put("power", Enchantment.ARROW_DAMAGE);
		ENCHANTMENTS.put("arrowpower", Enchantment.ARROW_DAMAGE);
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK);
		ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
		ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK);
Solution content 
		ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
		ENCHANTMENTS.put("flame", Enchantment.ARROW_FIRE);
		ENCHANTMENTS.put("flamearrow", Enchantment.ARROW_FIRE);

		ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
		ENCHANTMENTS.put("power", Enchantment.ARROW_DAMAGE);
		ENCHANTMENTS.put("arrowpower", Enchantment.ARROW_DAMAGE);

		ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK);
		ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
		ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
		ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
		ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK);
		ENCHANTMENTS.put("arrowpunch", Enchantment.ARROW_KNOCKBACK);
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java

=======
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/Enchantments.java
		ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
		ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE);
		ENCHANTMENTS.put("infinity", Enchantment.ARROW_INFINITE);
Solution content 
		ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
		ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK);
		ENCHANTMENTS.put("arrowpunch", Enchantment.ARROW_KNOCKBACK);

		ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
		ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE);
		ENCHANTMENTS.put("infinity", Enchantment.ARROW_INFINITE);
File
Enchantments.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
				return;
			}
		}
<<<<<<< HEAD

		user.acquireWriteLock();
=======
		
		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		String banReason;
		user.getData().setBan(new Ban());
		if (args.length > 1)
Solution content 
				return;
			}
		}

		user.acquireWriteLock();
		String banReason;
		user.getData().setBan(new Ban());
		if (args.length > 1)
File
Commandban.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		user.getData().setBan(new Ban());
		if (args.length > 1)
		{
<<<<<<< HEAD
			banReason = getFinalArg(args, 1);
			user.getData().getBan().setReason(banReason);
		}
		else
		{
			banReason = _("defaultBanReason");
			user.getData().getBan().setReason("");
=======
			banReason = _("banFormat", getFinalArg(args, 1), senderName);
		}
		else
		{
			banReason = _("banFormat", _("defaultBanReason"), senderName);
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		}
		
		user.setBanReason(banReason);
Solution content 
		user.getData().setBan(new Ban());
		if (args.length > 1)
		{
			banReason = getFinalArg(args, 1);
			user.getData().getBan().setReason(banReason);
		}
		else
		{
			banReason = _("defaultBanReason");
			user.getData().getBan().setReason("");
		}
File
Commandban.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
package com.earth2me.essentials.commands;

import static com.earth2me.essentials.I18n._;
<<<<<<< HEAD
import com.earth2me.essentials.utils.Util;
=======
import com.earth2me.essentials.Util;
import org.bukkit.Server;
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
import org.bukkit.command.CommandSender;
Solution content 
package com.earth2me.essentials.commands;

import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.Util;
import org.bukkit.command.CommandSender;
File
Commandbroadcast.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
		{
			throw new NotEnoughArgumentsException();
		}
<<<<<<< HEAD
=======

>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		ess.broadcastMessage(null, _("broadcast", Util.replaceFormat(getFinalArg(args, 0))));
	}
}
Solution content 
		{
			throw new NotEnoughArgumentsException();
		}
		ess.broadcastMessage(null, _("broadcast", Util.replaceFormat(getFinalArg(args, 0))));
	}
}
File
Commandbroadcast.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
			}
			disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
		}
<<<<<<< HEAD
		
=======
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		if (disabledCommands.length() > 0) {
			sender.sendMessage(_("blockList"));
			sender.sendMessage(disabledCommands.toString());
Solution content 
			}
			disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
		}
		
		if (disabledCommands.length() > 0) {
			sender.sendMessage(_("blockList"));
			sender.sendMessage(disabledCommands.toString());
File
Commandessentials.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.craftbukkit.SetExpFix;
<<<<<<< HEAD
import com.earth2me.essentials.permissions.Permissions;
import com.earth2me.essentials.utils.Util;
=======
import org.bukkit.Server;
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
Solution content 
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.craftbukkit.SetExpFix;
import com.earth2me.essentials.permissions.Permissions;
import com.earth2me.essentials.utils.Util;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
			}
			else
			{
<<<<<<< HEAD
=======
				expMatch(server, user, args[1], args[2], false);
			}
			else
			{
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
				setExp(user, user, args[1], false);
			}
		}
Solution content 
			}
			else
			{
				setExp(user, user, args[1], false);
			}
		}
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
		{
			if (args.length == 3 && Permissions.EXP_GIVE_OTHERS.isAuthorized(user))
			{
<<<<<<< HEAD
				expMatch(user, args[1], args[2], true);
=======
				expMatch(server, user, args[1], args[2], true);
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			}
			else
			{
Solution content 
		{
			if (args.length == 3 && Permissions.EXP_GIVE_OTHERS.isAuthorized(user))
			{
				expMatch(user, args[1], args[2], true);
			}
			else
			{
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
			{
				match = args[1].trim();
			}
<<<<<<< HEAD
			if (match.equalsIgnoreCase("show") || !Permissions.EXP_OTHERS.isAuthorized(user))
=======
			if (match.equalsIgnoreCase("show") || !user.isAuthorized("essentials.exp.others"))
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			{
				showExp(user, user);
			}
Solution content 
			{
				match = args[1].trim();
			}
			if (match.equalsIgnoreCase("show") || !Permissions.EXP_OTHERS.isAuthorized(user))
			{
				showExp(user, user);
			}
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
			}
			else
			{
<<<<<<< HEAD
				showMatch(user, match);
=======
				showMatch(server, user, match);
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			}
		}
	}
Solution content 
			}
			else
			{
				showMatch(user, match);
			}
		}
	}
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
		}
	}

<<<<<<< HEAD
	
	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
=======
	@Override
	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
	{
		if (args.length < 1)
		{
Solution content 
		}
	}

	
	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
	{
		if (args.length < 1)
		{
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method signature
Chunk
Conflicting content 
		}
		else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
		{
<<<<<<< HEAD
			expMatch(sender, args[1], args[2], false);
		}
		else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
		{
			expMatch(sender, args[1], args[2], true);
=======
			expMatch(server, sender, args[1], args[2], false);
		}
		else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
		{
			expMatch(server, sender, args[1], args[2], true);
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		}
		else
		{
Solution content 
		}
		else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
		{
			expMatch(sender, args[1], args[2], false);
		}
		else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
		{
			expMatch(sender, args[1], args[2], true);
		}
		else
		{
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
			{
				match = args[1].trim();
			}
<<<<<<< HEAD
			showMatch(sender, match);
		}
	}

	private void showMatch(final CommandSender sender, final String match) throws NotEnoughArgumentsException
=======
			showMatch(server, sender, match);
		}
	}

	private void showMatch(final Server server, final CommandSender sender, final String match) throws NotEnoughArgumentsException
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
	{
		boolean foundUser = false;
		for (Player matchPlayer : server.matchPlayer(match))
Solution content 
			{
				match = args[1].trim();
			}
			showMatch(sender, match);
		}
	}

	private void showMatch(final CommandSender sender, final String match) throws NotEnoughArgumentsException
	{
		boolean foundUser = false;
		for (Player matchPlayer : server.matchPlayer(match))
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
		for (Player matchPlayer : server.matchPlayer(match))
		{
			foundUser = true;
<<<<<<< HEAD
			final IUser target = ess.getUser(matchPlayer);
=======
			final User target = ess.getUser(matchPlayer);
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			showExp(sender, target);
		}
		if (!foundUser)
Solution content 
		for (Player matchPlayer : server.matchPlayer(match))
		{
			foundUser = true;
			final IUser target = ess.getUser(matchPlayer);
			showExp(sender, target);
		}
		if (!foundUser)
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		}
	}

<<<<<<< HEAD
	private void expMatch(final CommandSender sender, final String match, final String amount, final boolean toggle) throws NotEnoughArgumentsException
=======
	private void expMatch(final Server server, final CommandSender sender, final String match, final String amount, final boolean toggle) throws NotEnoughArgumentsException
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
	{
		boolean foundUser = false;
		for (Player matchPlayer : server.matchPlayer(match))
Solution content 
		}
	}

	private void expMatch(final CommandSender sender, final String match, final String amount, final boolean toggle) throws NotEnoughArgumentsException
	{
		boolean foundUser = false;
		for (Player matchPlayer : server.matchPlayer(match))
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
<<<<<<< HEAD
		boolean foundUser = false;
		for (Player matchPlayer : server.matchPlayer(match))
		{
			final IUser target = ess.getUser(matchPlayer);
=======
			final User target = ess.getUser(matchPlayer);
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			setExp(sender, target, amount, toggle);
			foundUser = true;
		}
Solution content 
		boolean foundUser = false;
		for (Player matchPlayer : server.matchPlayer(match))
		{
			final IUser target = ess.getUser(matchPlayer);
			setExp(sender, target, amount, toggle);
			foundUser = true;
		}
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		}
	}

<<<<<<< HEAD
	private void showExp(final CommandSender sender, final IUser target)
=======
	private void showExp(final CommandSender sender, final User target)
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
	{
		final int totalExp = SetExpFix.getTotalExperience(target);
		final int expLeft = (int)Util.roundDouble(((((3.5 * target.getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getLevel() * target.getLevel())) + (5.00 * target.getLevel())))) + 1));
Solution content 
		}
	}

	private void showExp(final CommandSender sender, final IUser target)
	{
		final int totalExp = SetExpFix.getTotalExperience(target);
		final int expLeft = (int)Util.roundDouble(((((3.5 * target.getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getLevel() * target.getLevel())) + (5.00 * target.getLevel())))) + 1));
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
		sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), expLeft));
	}

<<<<<<< HEAD
	private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give)
=======
	private void setExp(final CommandSender sender, final User target, final String strAmount, final boolean give)
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
	{
		Long amount = Long.parseLong(strAmount);
		if (give)
Solution content 
		sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), expLeft));
	}

	private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give)
	{
		Long amount = Long.parseLong(strAmount);
		if (give)
File
Commandexp.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
package com.earth2me.essentials.commands;

import static com.earth2me.essentials.I18n._;
<<<<<<< HEAD
import com.earth2me.essentials.api.IUser;
=======
import com.earth2me.essentials.User;
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
Solution content 
package com.earth2me.essentials.commands;

import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
File
Commandhat.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
public class Commandhat extends EssentialsCommand
{
	@Override
<<<<<<< HEAD
	protected void run(IUser user, String commandLabel, String[] args) throws Exception
=======
	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
	{
		if (args.length > 0 && (args[0].contains("rem") || args[0].contains("off") || args[0].equalsIgnoreCase("0")))
		{
Solution content 
public class Commandhat extends EssentialsCommand
{
	@Override
	protected void run(IUser user, String commandLabel, String[] args) throws Exception
	{
		if (args.length > 0 && (args[0].contains("rem") || args[0].contains("off") || args[0].equalsIgnoreCase("0")))
		{
File
Commandhat.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
			final PlayerInventory inv = user.getInventory();
			final ItemStack head = inv.getHelmet();
			if (head == null || head.getType() == Material.AIR)
<<<<<<< HEAD
			{
				user.sendMessage(_("hatEmpty"));
			}
			else
			{
=======
			{
				user.sendMessage(_("hatEmpty"));
			}
			else
			{
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
				final ItemStack air = new ItemStack(Material.AIR);
				inv.setHelmet(air);
				InventoryWorkaround.addItem(user.getInventory(), true, head);
Solution content 
			final PlayerInventory inv = user.getInventory();
			final ItemStack head = inv.getHelmet();
			if (head == null || head.getType() == Material.AIR)
			{
				user.sendMessage(_("hatEmpty"));
			}
			else
			{
				final ItemStack air = new ItemStack(Material.AIR);
				inv.setHelmet(air);
				InventoryWorkaround.addItem(user.getInventory(), true, head);
File
Commandhat.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
		{
			throw new Exception(_("playerNotFound"));
		}
<<<<<<< HEAD
		
		user.acquireWriteLock();
		if (user.isIgnoringPlayer(player))
=======
		if (user.isIgnoredPlayer(player))
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		{
			user.setIgnoredPlayer(player, false);
			user.sendMessage(_("unignorePlayer", player.getName()));
Solution content 
		{
			throw new Exception(_("playerNotFound"));
		}
		
		user.acquireWriteLock();
		if (user.isIgnoringPlayer(player))
		{
			user.setIgnoredPlayer(player, false);
			user.sendMessage(_("unignorePlayer", player.getName()));
File
Commandignore.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
		if (sender instanceof Player)
		{
			user = ess.getUser(((Player)sender));
<<<<<<< HEAD
		}
		if ((args.length < 1 || !Permissions.LIGHTNING_OTHERS.isAuthorized(user)) && user != null)
		{
			user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
			return;
=======
			if ((args.length < 1 || user != null && !user.isAuthorized("essentials.lightning.others")))
			{
				user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
				return;
			}
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		}
		if (server.matchPlayer(args[0]).isEmpty())
Solution content 
		if (sender instanceof Player)
		{
			user = ess.getUser(((Player)sender));
		}
		if ((args.length < 1 || !Permissions.LIGHTNING_OTHERS.isAuthorized(user)) && user != null)
		{
			user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
			return;
		}

		if (server.matchPlayer(args[0]).isEmpty())
File
Commandlightning.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Return statement
Chunk
Conflicting content 
		for (Player matchPlayer : server.matchPlayer(args[0]))
		{
			sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
<<<<<<< HEAD
			final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
=======

			final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
			
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			if (!ess.getUser(matchPlayer).isGodModeEnabled())
			{
				matchPlayer.damage(power, strike);
Solution content 
		for (Player matchPlayer : server.matchPlayer(args[0]))
		{
			sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
			final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
			if (!ess.getUser(matchPlayer).isGodModeEnabled())
			{
				matchPlayer.damage(power, strike);
File
Commandlightning.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
			{
				throw new Exception(_("playerNeverOnServer", args[1]));
			}
<<<<<<< HEAD
			if (!u.isIgnoringPlayer(user))
=======
			if (!u.isIgnoredPlayer(user))
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			{
				final String mail = Util.sanitizeString(Util.stripFormat(getFinalArg(args, 2)));
				u.addMail(user.getName() + ": " + mail);
Solution content 
			{
				throw new Exception(_("playerNeverOnServer", args[1]));
			}
			if (!u.isIgnoringPlayer(user))
			{
				final String mail = Util.sanitizeString(Util.stripFormat(getFinalArg(args, 2)));
				u.addMail(user.getName() + ": " + mail);
File
Commandmail.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
	@Override
	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
	{
<<<<<<< HEAD
		if (args.length < 2 || args[0].trim().length() < 3 || args[1].trim().isEmpty())
=======
		if (args.length < 2 || args[0].trim().length() < 3  || args[1].trim().isEmpty())
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		{
			throw new NotEnoughArgumentsException();
		}
Solution content 
	@Override
	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
	{
		if (args.length < 2 || args[0].trim().length() < 3 || args[1].trim().isEmpty())
		{
			throw new NotEnoughArgumentsException();
		}
File
Commandmsg.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
		for (Player matchedPlayer : matchedPlayers)
		{
			sender.sendMessage(_("msgFormat", translatedMe, matchedPlayer.getDisplayName(), message));
<<<<<<< HEAD
			final IUser matchedUser = ess.getUser(matchedPlayer);
			if (sender instanceof Player && (matchedUser.isIgnoringPlayer(ess.getUser(sender)) || matchedUser.isHidden()))
=======
			final User matchedUser = ess.getUser(matchedPlayer);
			if (sender instanceof Player && (matchedUser.isIgnoredPlayer(ess.getUser(sender)) || matchedUser.isHidden()))
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			{
				continue;
			}
Solution content 
		for (Player matchedPlayer : matchedPlayers)
		{
			sender.sendMessage(_("msgFormat", translatedMe, matchedPlayer.getDisplayName(), message));
			final IUser matchedUser = ess.getUser(matchedPlayer);
			if (sender instanceof Player && (matchedUser.isIgnoringPlayer(ess.getUser(sender)) || matchedUser.isHidden()))
			{
				continue;
			}
File
Commandmsg.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
		{
			throw new NotEnoughArgumentsException();
		}
<<<<<<< HEAD

=======
		
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		if (args[0].trim().length() < 3)
		{
			throw new NotEnoughArgumentsException("You need to specify a player to pay.");
Solution content 
		{
			throw new NotEnoughArgumentsException();
		}

		if (args[0].trim().length() < 3)
		{
			throw new NotEnoughArgumentsException("You need to specify a player to pay.");
File
Commandpay.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
		sender.sendMessage(_("msgFormat", _("me"), targetName, message));
		if (target instanceof Player)
		{
<<<<<<< HEAD
			IUser player = ess.getUser((Player)target);
			if (sender instanceof Player && player.isIgnoringPlayer(ess.getUser(sender)))
=======
			User player = ess.getUser(target);
			if (sender instanceof Player && player.isIgnoredPlayer(ess.getUser(sender)))
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			{
				return;
			}
Solution content 
		sender.sendMessage(_("msgFormat", _("me"), targetName, message));
		if (target instanceof Player)
		{
			IUser player = ess.getUser((Player)target);
			if (sender instanceof Player && player.isIgnoringPlayer(ess.getUser(sender)))
			{
				return;
			}
File
Commandr.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
		final String time = getFinalArg(args, 1);
		final long banTimestamp = DateUtil.parseDateDiff(time, true);

<<<<<<< HEAD
		final String banReason = _("tempBanned", DateUtil.formatDateDiff(banTimestamp));
		user.acquireWriteLock();
		user.getData().setBan(new Ban());
		user.getData().getBan().setReason(banReason);
		user.getData().getBan().setTimeout(banTimestamp);
=======
		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
		final String banReason = _("tempBanned", Util.formatDateDiff(banTimestamp), senderName);
		user.setBanReason(banReason);
		user.setBanTimeout(banTimestamp);
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		user.setBanned(true);
		user.kickPlayer(banReason);
Solution content 
		final String time = getFinalArg(args, 1);
		final long banTimestamp = DateUtil.parseDateDiff(time, true);

		final String banReason = _("tempBanned", DateUtil.formatDateDiff(banTimestamp));
		user.acquireWriteLock();
		user.getData().setBan(new Ban());
		user.getData().getBan().setReason(banReason);
		user.getData().getBan().setTimeout(banTimestamp);
		user.setBanned(true);
		user.kickPlayer(banReason);
		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
File
Commandtempban.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		{
			throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName()));
		}
<<<<<<< HEAD
		if (!player.isIgnoringPlayer(user))
=======
		if (!player.isIgnoredPlayer(user))
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		{
			player.requestTeleport(user, false);
			player.sendMessage(_("teleportRequest", user.getDisplayName()));
Solution content 
		{
			throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName()));
		}
		if (!player.isIgnoringPlayer(user))
		{
			player.requestTeleport(user, false);
			player.sendMessage(_("teleportRequest", user.getDisplayName()));
File
Commandtpa.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
		String message = "disableUnlimited";
		boolean enableUnlimited = false;
<<<<<<< HEAD
		if (!target.getData().hasUnlimited(stack.getType()))
=======
		if (!target.hasUnlimited(stack))
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		{
			message = "enableUnlimited";
			enableUnlimited = true;
Solution content 
		String message = "disableUnlimited";
		boolean enableUnlimited = false;
		if (!target.getData().hasUnlimited(stack.getType()))
		{
			message = "enableUnlimited";
			enableUnlimited = true;
File
Commandunlimited.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
package com.earth2me.essentials.commands;

import static com.earth2me.essentials.I18n._;
<<<<<<< HEAD
import com.earth2me.essentials.api.IUser;
=======
import com.earth2me.essentials.User;
import org.bukkit.Server;
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be


public class Commandvanish extends EssentialsCommand
Solution content 
package com.earth2me.essentials.commands;

import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IUser;


public class Commandvanish extends EssentialsCommand
File
Commandvanish.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
public class Commandvanish extends EssentialsCommand
{
	@Override
<<<<<<< HEAD
	protected void run(IUser user, String commandLabel, String[] args) throws Exception
=======
	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
	{
		if (args.length < 1)
		{
Solution content 
public class Commandvanish extends EssentialsCommand
{
	@Override
	protected void run(IUser user, String commandLabel, String[] args) throws Exception
	{
		if (args.length < 1)
		{
File
Commandvanish.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
		{
			user.toggleVanished();
			if (user.isVanished())
<<<<<<< HEAD
			{
				user.sendMessage(_("vanished"));
			}
			else
			{
=======
			{
				user.sendMessage(_("vanished"));
			}
			else
			{
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
				user.sendMessage(_("unvanished"));
			}
		}
Solution content 
		{
			user.toggleVanished();
			if (user.isVanished())
			{
				user.sendMessage(_("vanished"));
			}
			else
			{
				user.sendMessage(_("unvanished"));
			}
		}
File
Commandvanish.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
			}
			user.sendMessage(user.isVanished() ? _("vanished") : _("unvanished"));
		}
<<<<<<< HEAD
	}		
=======
	}
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
}
Solution content 
			}
			user.sendMessage(user.isVanished() ? _("vanished") : _("unvanished"));
		}
	}		
}
File
Commandvanish.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
			showhidden = true;
		}
		final String whois = args[0].toLowerCase(Locale.ENGLISH);
<<<<<<< HEAD
		@Cleanup
		ISettings settings = ess.getSettings();
		settings.acquireReadLock();
		final int prefixLength = Util.stripColor(settings.getData().getChat().getNicknamePrefix()).length();
		boolean foundPlayer = false;
=======
		final int prefixLength = Util.stripFormat(ess.getSettings().getNicknamePrefix()).length();
		boolean foundUser = false;
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
		for (Player onlinePlayer : server.getOnlinePlayers())
		{
			@Cleanup
Solution content 
			showhidden = true;
		}
		final String whois = args[0].toLowerCase(Locale.ENGLISH);
		@Cleanup
		ISettings settings = ess.getSettings();
		settings.acquireReadLock();
		final int prefixLength = Util.stripColor(settings.getData().getChat().getNicknamePrefix()).length();
		boolean foundPlayer = false;
		for (Player onlinePlayer : server.getOnlinePlayers())
		{
			@Cleanup
File
Commandwhois.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method invocation
Variable
Chunk
Conflicting content 
			{
				continue;
			}
<<<<<<< HEAD
			foundPlayer = true;
=======
			foundUser = true;
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			sender.sendMessage(_("whoisTop", user.getName()));
			user.setDisplayNick();
			sender.sendMessage(_("whoisNick", user.getDisplayName()));
Solution content 
			{
				continue;
			}
			foundPlayer = true;
			sender.sendMessage(_("whoisTop", user.getName()));
			user.setDisplayNick();
File
Commandwhois.java
Developer's decision
Version 1
Kind of conflict
Variable
Chunk
Conflicting content 
			user.setDisplayNick();
			sender.sendMessage(_("whoisNick", user.getDisplayName()));
			sender.sendMessage(_("whoisHealth", user.getHealth()));
<<<<<<< HEAD
			sender.sendMessage(_("whoisExp", SetExpFix.getTotalExperience(user), user.getLevel()));
=======
			sender.sendMessage(_("whoisExp", SetExpFix.getTotalExperience(user), user.getLevel()));			
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			sender.sendMessage(_("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ()));
			sender.sendMessage(_("whoisMoney", Util.displayCurrency(user.getMoney(), ess)));
			sender.sendMessage(_("whoisIPAddress", user.getAddress().getAddress().toString()));
Solution content 
			user.setDisplayNick();
			sender.sendMessage(_("whoisIs", user.getDisplayName(), user.getName()));
			sender.sendMessage(_("whoisHealth", user.getHealth()));
			sender.sendMessage(_("whoisExp", SetExpFix.getTotalExperience(user), user.getLevel()));
			sender.sendMessage(_("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ()));
			sender.sendMessage(_("whoisMoney", Util.displayCurrency(user.getMoney(), ess)));
			sender.sendMessage(_("whoisIPAddress", user.getAddress().getAddress().toString()));
File
Commandwhois.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
			{
				sender.sendMessage(_("whoisGeoLocation", location));
			}
<<<<<<< HEAD
			sender.sendMessage(_("whoisGamemode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH))));
			sender.sendMessage(_("whoisGod", (user.isGodModeEnabled() ? _("true") : _("false"))));
			sender.sendMessage(_("whoisOP", (user.isOp() ? _("true") : _("false"))));
			sender.sendMessage(_("whoisFly", user.getAllowFlight() ? _("true") : _("false"), user.isFlying() ? _("flying") : _("notFlying")));
			sender.sendMessage(_("whoisAFK", (user.getData().isAfk() ? _("true") : _("false"))));
			sender.sendMessage(_("whoisJail", (user.getData().isJailed()
											   ? user.getTimestamp(UserData.TimestampType.JAIL) > 0
												 ? DateUtil.formatDateDiff(user.getTimestamp(UserData.TimestampType.JAIL))
												 : _("true")
											   : _("false"))));
			sender.sendMessage(_("whoisMute", (user.getData().isMuted()
											   ? user.getTimestamp(UserData.TimestampType.MUTE) > 0
												 ? DateUtil.formatDateDiff(user.getTimestamp(UserData.TimestampType.MUTE))
												 : _("true")
											   : _("false"))));
			
			if (!foundPlayer)
=======
			sender.sendMessage(_("whoisIPAddress", user.getAddress().getAddress().toString()));
			final String location = user.getGeoLocation();
			if (location != null
				&& (sender instanceof Player ? ess.getUser(sender).isAuthorized("essentials.geoip.show") : true))
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			{
				throw new NoSuchFieldException(_("playerNotFound"));
			}
Solution content 
			{
				sender.sendMessage(_("whoisGeoLocation", location));
			}
			sender.sendMessage(_("whoisGamemode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH))));
			sender.sendMessage(_("whoisGod", (user.isGodModeEnabled() ? _("true") : _("false"))));
			sender.sendMessage(_("whoisOP", (user.isOp() ? _("true") : _("false"))));
			sender.sendMessage(_("whoisFly", user.getAllowFlight() ? _("true") : _("false"), user.isFlying() ? _("flying") : _("notFlying")));
			sender.sendMessage(_("whoisAFK", (user.getData().isAfk() ? _("true") : _("false"))));
			sender.sendMessage(_("whoisJail", (user.getData().isJailed()
											   ? user.getTimestamp(UserData.TimestampType.JAIL) > 0
												 ? DateUtil.formatDateDiff(user.getTimestamp(UserData.TimestampType.JAIL))
												 : _("true")
											   : _("false"))));
			sender.sendMessage(_("whoisMute", (user.getData().isMuted()
											   ? user.getTimestamp(UserData.TimestampType.MUTE) > 0
												 ? DateUtil.formatDateDiff(user.getTimestamp(UserData.TimestampType.MUTE))
												 : _("true")
											   : _("false"))));
			
			if (!foundPlayer)
			{
				throw new NoSuchFieldException(_("playerNotFound"));
			}
File
Commandwhois.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
			ipAddress = user.getAddress().getAddress().toString();
			address = user.getAddress().toString();
			balance = Double.toString(user.getMoney());
<<<<<<< HEAD:Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java
			mails = Integer.toString(user.getData().getMails() == null ? 0 : user.getData().getMails().size());
			world = user.getLocation().getWorld().getName();
			worldTime12 = DescParseTickFormat.format12(user.getWorld().getTime());
			worldTime24 = DescParseTickFormat.format24(user.getWorld().getTime());
			worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(DescParseTickFormat.ticksToDate(user.getWorld().getFullTime()));
=======
			mails = Integer.toString(user.getMails().size());
			world = user.getLocation() == null || user.getLocation().getWorld() == null ? "" : user.getLocation().getWorld().getName();
			worldTime12 = DescParseTickFormat.format12(user.getWorld() == null ? 0 : user.getWorld().getTime());
			worldTime24 = DescParseTickFormat.format24(user.getWorld() == null ? 0 : user.getWorld().getTime());
			worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(DescParseTickFormat.ticksToDate(user.getWorld() == null ? 0 : user.getWorld().getFullTime()));
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
		}
		else
		{
Solution content 
			ipAddress = user.getAddress().getAddress().toString();
			address = user.getAddress().toString();
			balance = Double.toString(user.getMoney());
			mails = Integer.toString(user.getData().getMails() == null ? 0 : user.getData().getMails().size());
			world = user.getLocation().getWorld().getName();
			worldTime12 = DescParseTickFormat.format12(user.getWorld().getTime());
			worldTime24 = DescParseTickFormat.format24(user.getWorld().getTime());
			worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(DescParseTickFormat.ticksToDate(user.getWorld().getFullTime()));
		}
		else
		{
File
KeywordReplacer.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	{
	}

<<<<<<< HEAD
=======
	public boolean isAborted(final PlayerChatEvent event)
	{
		if (event.isCancelled())
		{
			return true;
		}
		for (IEssentialsChatListener listener : listeners.values())
		{
			if (listener.shouldHandleThisChat(event))
			{
				return true;
			}
		}
		return false;
	}

	public String getChatType(final String message)
	{
		switch (message.charAt(0))
		{
		case '!':
			return "shout";
		case '?':
			return "question";
		//case '@':
		//return "admin";
		default:
			return "";
		}
	}

>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
	public ChatStore getChatStore(final PlayerChatEvent event)
	{
		return chatStorage.get(event);
Solution content 
	{
	}

	public ChatStore getChatStore(final PlayerChatEvent event)
	{
		return chatStorage.get(event);
File
EssentialsChatPlayer.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
		if (event.getMessage().length() > 1 && chatStore.getType().length() > 0)
		{
<<<<<<< HEAD
			if (ChatPermissions.getPermission(chatStore.getType()).isAuthorized(user))
			{
				final StringBuilder format = new StringBuilder();
				format.append(chatStore.getType()).append("Format");
				event.setMessage(event.getMessage().substring(1));
				event.setFormat(_(format.toString(), event.getFormat()));
				return;
=======
			String type = _("chatTypeLocal");
			final User onlineUser = ess.getUser(onlinePlayer);
			if (onlineUser.isIgnoredPlayer(sender))
			{
				continue;
			}
			if (!onlineUser.equals(sender))
			{
				boolean abort = false;
				final Location playerLoc = onlineUser.getLocation();
				if (playerLoc.getWorld() != world)
				{
					abort = true;
				}
				final double delta = playerLoc.distanceSquared(loc);
				if (delta > chatStore.getRadius())
				{
					abort = true;
				}
				if (abort)
				{
					if (onlineUser.isAuthorized("essentials.chat.spy"))
					{
						type = type.concat(_("chatTypeSpy"));
					}
					else
					{
						continue;
					}
				}
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be
			}

			final StringBuilder errorMsg = new StringBuilder();
Solution content 
		if (event.getMessage().length() > 1 && chatStore.getType().length() > 0)
		{
			if (ChatPermissions.getPermission(chatStore.getType()).isAuthorized(user))
			{
				final StringBuilder format = new StringBuilder();
				format.append(chatStore.getType()).append("Format");
				event.setMessage(event.getMessage().substring(1));
				event.setFormat(_(format.toString(), event.getFormat()));
				return;
			}

			final StringBuilder errorMsg = new StringBuilder();
File
EssentialsChatPlayer.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
	public final boolean onSignInteract(final Block block, final Player player, final IEssentials ess)
	{
		final ISign sign = new BlockSign(block);
<<<<<<< HEAD:EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java
		final IUser user = ess.getUser(player);
=======
		final User user = ess.getUser(player);
		if (user.checkSignThrottle())
		{
			return false;
		}
>>>>>>> 0395b5d222c137b1db664a1f74dd8cca2b4299be:Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
		try
		{
			return SignsPermissions.getUsePermission(signName).isAuthorized(user)
Solution content 
	public final boolean onSignInteract(final Block block, final Player player, final IEssentials ess)
	{
		final ISign sign = new BlockSign(block);
		final IUser user = ess.getUser(player);
		try
		{
			return SignsPermissions.getUsePermission(signName).isAuthorized(user)
File
EssentialsSign.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable