Projects >> Citizens >>4aeda61e7a00d8b8e26cc684a2506d2d90ad6039

Chunk
Conflicting content 
	}

	public void setProgress(QuestProgress progress) {
<<<<<<< HEAD
		this.progress = progress;
		if (this.profile.pathExists("quests.current"))
			this.profile.removeKey("quests.current");
=======
		if (profile.pathExists("quests.current")) {
			this.progress = progress;
			this.profile.removeKey("quests.current");
		}
>>>>>>> 26b7570f7c437915a06baddbf32545068303b6b9
	}

	public void setRank(int rank) {
Solution content 
	}

	public void setProgress(QuestProgress progress) {
		this.progress = progress;
		if (this.profile.pathExists("quests.current"))
			this.profile.removeKey("quests.current");
		}
	}

	public void setRank(int rank) {
File
PlayerProfile.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Chunk
Conflicting content 
	}

	/*
<<<<<<< HEAD
		private boolean checkData(Stockable stockable, MaterialData second) {
			MaterialData first = stockable.getStocking().getData();
			int data = 0;
			int data2 = 0;
			if (first != null) {
				data = first.getData();
			}
			if (second != null) {
				data2 = second.getData();
			}
	        return data == data2;
	    }
	*/
=======
	 * private boolean checkData(Stockable stockable, MaterialData second) {
	 * MaterialData first = stockable.getStocking().getData(); int data = 0; int
	 * data2 = 0; if (first != null) { data = first.getData(); } if (second !=
	 * null) { data2 = second.getData(); } return data == data2; }
	 */
>>>>>>> 26b7570f7c437915a06baddbf32545068303b6b9
	public boolean checkStockingIntegrity() {
		return !(this.stocking == null || this.stocking.isEmpty());
	}
Solution content 
	}

	/*
		private boolean checkData(Stockable stockable, MaterialData second) {
			MaterialData first = stockable.getStocking().getData();
			int data = 0;
			int data2 = 0;
			if (first != null) {
				data = first.getData();
			}
			if (second != null) {
				data2 = second.getData();
			}
	        return data == data2;
	    }
	*/
	public boolean checkStockingIntegrity() {
		return !(this.stocking == null || this.stocking.isEmpty());
	}
File
TraderNPC.java
Developer's decision
Version 1
Kind of conflict
Comment