| Chunk |
|---|
| Conflicting content |
|---|
import net.canarymod.Canary; import net.canarymod.CanaryServer; <<<<<<< HEAD import net.canarymod.api.CanaryConfigurationManager; import net.canarymod.api.CanaryEntityTracker; import net.canarymod.api.EntityTracker; import net.canarymod.api.entity.CanaryPlayer; import net.canarymod.api.entity.Player; import net.canarymod.api.world.CanaryDimension; import net.canarymod.api.world.CanaryWorld; import net.canarymod.api.world.CanaryWorldManager; import net.canarymod.api.world.Dimension; import net.canarymod.api.world.Dimension.Type; import net.canarymod.api.world.World; ======= import net.canarymod.config.Configuration; >>>>>>> 1882acdbeef298413e8ff22c70ad6d10f3b900e3 import net.minecraft.server.OAnvilSaveConverter; import net.minecraft.server.OAnvilSaveHandler; import net.minecraft.server.OAxisAlignedBB; |
| Solution content |
|---|
import net.canarymod.Canary; import net.canarymod.CanaryMod; import net.canarymod.CanaryServer; import net.canarymod.api.CanaryConfigurationManager; import net.canarymod.api.CanaryEntityTracker; import net.canarymod.api.EntityTracker; import net.canarymod.api.entity.CanaryPlayer; import net.canarymod.api.entity.Player; import net.canarymod.api.world.CanaryDimension; import net.canarymod.api.world.CanaryWorld; import net.canarymod.api.world.CanaryWorldManager; import net.canarymod.api.world.Dimension; import net.canarymod.api.world.Dimension.Type; import net.canarymod.api.world.World; import net.minecraft.server.OAnvilSaveConverter; import net.minecraft.server.OAnvilSaveHandler; import net.minecraft.server.OAxisAlignedBB; |
| File |
|---|
| OMinecraftServer.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
a.info("Converting map!");
var1.a(var2, new OConvertProgressUpdater(this));
}
<<<<<<< HEAD
OWorldServer[] toLoad = new OWorldServer[3];
// this.worldServer = new OWorldServer[3];
// this.g = new long[this.worldServer.length][100]; //CanaryMod Moved to CanaryWorld |
| Solution content |
|---|
a.info("Converting map!");
var1.a(var2, new OConvertProgressUpdater(this));
}
OWorldServer[] toLoad = new OWorldServer[3];
// this.worldServer = new OWorldServer[3];
// this.g = new long[this.worldServer.length][100]; //CanaryMod Moved to CanaryWorld |
| File |
|---|
| OMinecraftServer.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
toLoad[var10] = new OWorldServerMulti(this, var9, var2, var11, var8, toLoad[0]);
}
<<<<<<< HEAD
toLoad[var10].a(new OWorldManager(this, toLoad[var10]));
toLoad[var10].q = this.d.a("difficulty", 1); // get int property
toLoad[var10].a(this.d.a("spawn-monsters", true), this.o); // get boolean property
toLoad[var10].s().d(var6);
=======
this.e[var10].a(new OWorldManager(this, this.e[var10]));
this.e[var10].q = this.d.a("difficulty", 1); // MW
this.e[var10].a(this.d.a("spawn-monsters", true), this.o); // MW
this.e[var10].s().d(var6);
this.h.a(this.e);
>>>>>>> 1882acdbeef298413e8ff22c70ad6d10f3b900e3
}
CanaryWorld world = new CanaryWorld(var2, toLoad);
worldManager.addWorld(world); |
| Solution content |
|---|
toLoad[var10] = new OWorldServerMulti(this, var9, var2, var11, var8, toLoad[0]);
}
toLoad[var10].a(new OWorldManager(this, toLoad[var10]));
toLoad[var10].q = this.d.a("difficulty", 1); // get int property
toLoad[var10].a(this.d.a("spawn-monsters", true), this.o); // get boolean property
toLoad[var10].s().d(var6);
}
CanaryWorld world = new CanaryWorld(var2, toLoad);
worldManager.addWorld(world); |
| File |
|---|
| OMinecraftServer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Array access |
| Attribute |
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
// for (var11 = 0; var11 < this.worldServer.length; ++var11) {
for(World canaryWorld : worldManager.getAllWorlds()) {
long var7 = System.nanoTime();
<<<<<<< HEAD
Dimension[] level = canaryWorld.getDimensions();
for(var11 = 0; var11 < level.length; ++var11) {
if (var11 == 0 || this.d.a("allow-nether", true)) {
OWorldServer var9 = (OWorldServer) ((CanaryDimension)level[var11]).getHandle();
if (this.j % 20 == 0) {
for(Player p : cfgManager.getAllPlayers()) {
((CanaryPlayer)p).getHandle().getServerHandler().sendPacket(new OPacket4UpdateTime(var9.o()) );
}
}
=======
if (var11 == 0 || this.d.a("allow-nether", true)) { // MW, remove
OWorldServer var9 = this.e[var11];
if (this.j % 20 == 0) {
this.h.a((new OPacket4UpdateTime(var9.o())), var9.t.g);
}
>>>>>>> 1882acdbeef298413e8ff22c70ad6d10f3b900e3
try {
var9.h(); |
| Solution content |
|---|
// for (var11 = 0; var11 < this.worldServer.length; ++var11) {
for(World canaryWorld : worldManager.getAllWorlds()) {
long var7 = System.nanoTime();
Dimension[] level = canaryWorld.getDimensions();
for(var11 = 0; var11 < level.length; ++var11) {
if (var11 == 0 || this.d.a("allow-nether", true)) {
OWorldServer var9 = (OWorldServer) ((CanaryDimension)level[var11]).getHandle();
if (this.j % 20 == 0) {
for(Player p : cfgManager.getAllPlayers()) {
((CanaryPlayer)p).getHandle().getServerHandler().sendPacket(new OPacket4UpdateTime(var9.o()) );
}
}
try {
var9.h(); |
| File |
|---|
| OMinecraftServer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Array access |
| Cast expression |
| Comment |
| For statement |
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import net.canarymod.Canary; import net.canarymod.CanaryServer; <<<<<<< HEAD import net.canarymod.api.CanaryConfigurationManager; import net.canarymod.api.CanaryPlayerManager; import net.canarymod.api.entity.CanaryPlayer; import net.canarymod.api.entity.Player; import net.canarymod.api.world.CanaryDimension; import net.canarymod.api.world.CanaryWorld; import net.canarymod.api.world.Dimension; import net.canarymod.api.world.World; ======= import net.canarymod.config.Configuration; >>>>>>> 1882acdbeef298413e8ff22c70ad6d10f3b900e3 import net.minecraft.server.OChunkCoordinates; import net.minecraft.server.OEntityPlayer; import net.minecraft.server.OEntityPlayerMP; |
| Solution content |
|---|
import net.canarymod.Canary; import net.canarymod.CanaryServer; import net.canarymod.api.CanaryConfigurationManager; import net.canarymod.api.CanaryPlayerManager; import net.canarymod.api.entity.CanaryPlayer; import net.canarymod.api.entity.Player; import net.canarymod.api.world.CanaryDimension; import net.canarymod.api.world.CanaryWorld; import net.canarymod.api.world.Dimension; import net.canarymod.api.world.World; import net.minecraft.server.OChunkCoordinates; import net.minecraft.server.OEntityPlayer; import net.minecraft.server.OEntityPlayerMP; |
| File |
|---|
| OServerConfigurationManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
//Just for the records
super();
this.c = var1;
<<<<<<< HEAD
this.j = var1.a("banned-players.txt");
this.k = var1.a("banned-ips.txt");
this.l = var1.a("ops.txt");
this.m = var1.a("white-list.txt");
int var2 = var1.d.a("view-distance", 10);
// this.d[0] = new OPlayerManager(var1, 0, var2);
// this.d[1] = new OPlayerManager(var1, -1, var2);
// this.d[2] = new OPlayerManager(var1, 1, var2);
this.e = var1.d.a("max-players", 20);
this.o = var1.d.a("white-list", false);
this.l();
this.n();
this.p();
this.r();
this.m();
this.o();
this.q();
this.s();
canaryCfgManager = new CanaryConfigurationManager(this);
var1.setCanaryConfigurationmanager(canaryCfgManager);
}
/**
* CanaryMod: Return the cfg manager wrapper
* @return the canaryCfgManager
*/
public CanaryConfigurationManager getCanaryConfigurationManager() {
return canaryCfgManager;
=======
// CanaryMod start: changing configurations
//this.j = var1.a("banned-players.txt");
//this.k = var1.a("banned-ips.txt");
//this.l = var1.a("ops.txt");
//this.m = var1.a("white-list.txt");
int var2 = Configuration.getNetConfig().getViewDistance();
// Creates player managers per dimension (MW: create one per dimension per world)
this.d[0] = new OPlayerManager(var1, 0, var2);
this.d[1] = new OPlayerManager(var1, -1, var2);
this.d[2] = new OPlayerManager(var1, 1, var2);
this.e = Configuration.getNetConfig().getMaxPlayers();
// CanaryMod: disable vanilla whitelisting
this.o = false;
// CanaryMod: don't load the default whitelists and bans
//this.l();
//this.n();
//this.p();
//this.r();
//this.m();
//this.o();
//this.q();
//this.s();
>>>>>>> 1882acdbeef298413e8ff22c70ad6d10f3b900e3
}
public void a(OWorldServer[] var1) { |
| Solution content |
|---|
//Just for the records
super();
this.c = var1;
// CanaryMod start: changing configurations
//this.j = var1.a("banned-players.txt");
//this.k = var1.a("banned-ips.txt");
//this.l = var1.a("ops.txt");
//this.m = var1.a("white-list.txt");
int var2 = Configuration.getNetConfig().getViewDistance();
// Creates player managers per dimension (MW: create one per dimension per world)
// this.d[0] = new OPlayerManager(var1, 0, var2);
// this.d[1] = new OPlayerManager(var1, -1, var2);
// this.d[2] = new OPlayerManager(var1, 1, var2);
this.e = Configuration.getNetConfig().getMaxPlayers();
// CanaryMod: disable vanilla whitelisting
this.o = false;
// CanaryMod: don't load the default whitelists and bans
//this.l();
//this.n();
//this.p();
//this.r();
//this.m();
//this.o();
//this.q();
//this.s();
canaryCfgManager = new CanaryConfigurationManager(this);
var1.setCanaryConfigurationmanager(canaryCfgManager);
}
/**
* CanaryMod: Return the cfg manager wrapper
* @return the canaryCfgManager
*/
public CanaryConfigurationManager getCanaryConfigurationManager() {
return canaryCfgManager;
}
public void a(OWorldServer[] var1) { |
| File |
|---|
| OServerConfigurationManager.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Array access |
| Attribute |
| Comment |
| Method invocation |
| Method signature |
| Return statement |
| Variable |