Projects >> Spoutcraft >>022b9831c07be0e5bf8a063cc8f6e90409fb92b6

Chunk
Conflicting content 
			}
		}
		if (SpoutClient.getInstance().isSpoutEnabled()) {
<<<<<<< HEAD
			sendQueue.addToSendQueue(new CustomPacket(new PacketKeyPress((byte)i, keyReleased, (MovementInputFromOptions)movementInput, ScreenType.GAME_SCREEN)));
			SpoutClient.getInstance().getKeyBindingManager().pressKey(i, keyReleased, ScreenType.GAME_SCREEN.getCode());
=======
			SpoutClient.getInstance().getPacketManager().sendSpoutPacket(new PacketKeyPress((byte)i, keyReleased, (MovementInputFromOptions)movementInput, ScreenType.GAME_SCREEN));
>>>>>>> 1b55f63df7c016976d80e96d44c0725b83e3ec2c
		}
		
		super.handleKeyPress(i, keyReleased);
Solution content 
			}
		}
		if (SpoutClient.getInstance().isSpoutEnabled()) {
			sendQueue.addToSendQueue(new CustomPacket(new PacketKeyPress((byte)i, keyReleased, (MovementInputFromOptions)movementInput, ScreenType.GAME_SCREEN)));
			SpoutClient.getInstance().getPacketManager().sendSpoutPacket(new PacketKeyPress((byte)i, keyReleased, (MovementInputFromOptions)movementInput, ScreenType.GAME_SCREEN));
		}
		
		super.handleKeyPress(i, keyReleased);
File
EntityClientPlayerMP.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
	public ClientPlayer player = null;
	private boolean cheating = true;
	private RenderDelegate render = new MCRenderDelegate();
<<<<<<< HEAD
	private KeyBindingManager bindingManager = new SimpleKeyBindingManager();
=======
	private SimpleCommandMap commandMap = new SimpleCommandMap(this);
	private SimpleAddonManager addonManager = new SimpleAddonManager(this, commandMap);
	private Logger log = Logger.getLogger(SpoutClient.class.getName());
	private Mode clientMode = Mode.Menu;
>>>>>>> 1b55f63df7c016976d80e96d44c0725b83e3ec2c
	
	static {
		dataMiningThread.start();
Solution content 
	public ClientPlayer player = null;
	private boolean cheating = true;
	private RenderDelegate render = new MCRenderDelegate();
	private KeyBindingManager bindingManager = new SimpleKeyBindingManager();
	private SimpleCommandMap commandMap = new SimpleCommandMap(this);
	private SimpleAddonManager addonManager = new SimpleAddonManager(this, commandMap);
	private Logger log = Logger.getLogger(SpoutClient.class.getName());
	private Mode clientMode = Mode.Menu;
	
	static {
		dataMiningThread.start();
File
SpoutClient.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
	public void setCamera(Location arg0) {
		// TODO Auto-generated method stub
		
	}

	@Override
	public KeyBindingManager getKeyBindingManager() {
		return bindingManager;
	}
=======
>>>>>>> 1b55f63df7c016976d80e96d44c0725b83e3ec2c
}
Solution content 
        }
    }

	public void setCamera(Location arg0) {
		// TODO Auto-generated method stub
		
	}

	@Override
	public KeyBindingManager getKeyBindingManager() {
		return bindingManager;
	}
}
File
SpoutClient.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration