Projects >> SpoutcraftPlugin >>8953f591331bf425391edb0ed8bb0fca2cd79f37

Chunk
Conflicting content 
	private GenericOverlayScreen currentScreen = null;
	public SpoutCraftChunk lastTickChunk = null;
	public Set lastTickAdjacentChunks = new HashSet(); 
<<<<<<< HEAD
	private boolean screenOpenThisTick = false;
	
=======
>>>>>>> 6014a94bc841fc515038697056de4c62e1c0313f
	public LinkedList queued = new LinkedList();

	public SpoutCraftPlayer(CraftServer server, EntityPlayer entity) {
Solution content 
	private GenericOverlayScreen currentScreen = null;
	public SpoutCraftChunk lastTickChunk = null;
	public Set lastTickAdjacentChunks = new HashSet(); 
	private boolean screenOpenThisTick = false;
	public LinkedList queued = new LinkedList();

	public SpoutCraftPlayer(CraftServer server, EntityPlayer entity) {
File
SpoutCraftPlayer.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
		updateBukkitEntity(player);
		return (SpoutCraftPlayer)((((CraftPlayer)player).getHandle()).getBukkitEntity());
	}
<<<<<<< HEAD

	@Override
	public void setPreCachingComplete(boolean complete) {
		if(!precachingComplete) {
			precachingComplete = complete;
		}
	}

	@Override
	public boolean isPreCachingComplete() {
		int minorBuild = -1;
		try {
			minorBuild = Integer.parseInt(getVersionString().split("\\.")[3]);
		}
		catch (Exception e) {
			
		}
		if(isSpoutCraftEnabled() && minorBuild > 276){
			return precachingComplete;
		} else {
			return true;
		}
	}

	@Override
	public void openSignEditGUI(Sign sign) {
		if(sign != null && isSpoutCraftEnabled())
		{
			sendPacket(new PacketOpenSignGUI(sign.getX(), sign.getY(), sign.getZ()));
			TileEntitySign tes = (TileEntitySign) ((CraftWorld)((CraftBlock)sign.getBlock()).getWorld()).getTileEntityAt(sign.getX(), sign.getY(), sign.getZ()); // Found a hidden trace to The Elder Scrolls. Bethestas Lawyers are right!
			tes.a(true);
			openScreen(ScreenType.SIGN_SCREEN, false);
		}
	}
=======
>>>>>>> 6014a94bc841fc515038697056de4c62e1c0313f
}
Solution content 
		updateBukkitEntity(player);
		return (SpoutCraftPlayer)((((CraftPlayer)player).getHandle()).getBukkitEntity());
	}

	@Override
	public void setPreCachingComplete(boolean complete) {
		if(!precachingComplete) {
			precachingComplete = complete;
		}
	}

	@Override
	public boolean isPreCachingComplete() {
		int minorBuild = -1;
		try {
			minorBuild = Integer.parseInt(getVersionString().split("\\.")[3]);
		}
		catch (Exception e) {
			
		}
		if(isSpoutCraftEnabled() && minorBuild > 276){
			return precachingComplete;
		} else {
			return true;
		}
	}

	@Override
	public void openSignEditGUI(Sign sign) {
		if(sign != null && isSpoutCraftEnabled())
		{
			sendPacket(new PacketOpenSignGUI(sign.getX(), sign.getY(), sign.getZ()));
			TileEntitySign tes = (TileEntitySign) ((CraftWorld)((CraftBlock)sign.getBlock()).getWorld()).getTileEntityAt(sign.getX(), sign.getY(), sign.getZ()); // Found a hidden trace to The Elder Scrolls. Bethestas Lawyers are right!
			tes.a(true);
			openScreen(ScreenType.SIGN_SCREEN, false);
		}
	}
}
File
SpoutCraftPlayer.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration