| Chunk |
|---|
| Conflicting content |
|---|
}
}
else if (args.length == 2 && user.isAuthorized(othersPermission))
<<<<<<< HEAD
{
toggleOtherPlayers(server, user, args);
=======
{
toggleOtherPlayers(server, user.getBase(), args);
>>>>>>> 60682e1ab57ce08d9a1bb1ba28dbcc431fafdf05
}
else
{ |
| Solution content |
|---|
}
}
else if (args.length == 2 && user.isAuthorized(othersPermission))
{
toggleOtherPlayers(server, user.getBase(), args);
}
else
{ |
| File |
|---|
| Commandgod.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
user.setFoodLevel(20);
}
<<<<<<< HEAD
user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled")));
if (!sender.equals(user))
{
sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName())));
}
}
else
=======
user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled")));
if (!sender.equals(user.getBase()))
>>>>>>> 60682e1ab57ce08d9a1bb1ba28dbcc431fafdf05
{
sender.sendMessage("Could not enable godmode, UserToggleGodmodeEvent was cancelled"); //TODO: a better message
} |
| Solution content |
|---|
}
user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled")));
if (!sender.equals(user.getBase()))
{
sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName())));
} |
| File |
|---|
| Commandgod.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |