Projects >> Custom-Salem >>056300c352e4a1b6aa6ca5c274f3d39d7af56d11

Chunk
Conflicting content
							List layers = new LinkedList();
							while(true) {
								int rtype = msg.uint8();
<<<<<<< HEAD
								String layer = msg.string();
								if(layer.equals(""))
									break;
								types.add(rtype);
								layers.add(layer);
=======
								String res = msg.string();
								oc.cres(id, frame, rtype, res);
							} else if(type == OD_LINBEG) {
								Coord s = msg.coord();
								Coord t = msg.coord();
								int c = msg.int32();
								oc.linbeg(id, frame, s, t, c);
							} else if(type == OD_LINSTEP) {
								int l = msg.int32();
								oc.linstep(id, frame, l);
							} else if(type == OD_SPEECH) {
								Coord off = msg.coord();
								String text = msg.string();
								oc.speak(id, frame, off, text);
							} else if((type == OD_LAYERS) || (type == OD_AVATAR)) {
								List types = new LinkedList();
								List layers = new LinkedList();
								while(true) {
									int rtype = msg.uint8();
									String layer = msg.string();
									if(layer.equals(""))
										break;
									types.add(rtype);
									layers.add(layer);
								}
								if(type == OD_LAYERS)
									oc.layers(id, frame, types, layers);
								else
									oc.avatar(id, frame, types, layers);
							} else if(type == OD_DRAWOFF) {
								Coord off = msg.coord();
								oc.drawoff(id, frame, off);
							} else if(type == OD_LUMIN) {
								oc.lumin(id, frame, msg.coord(), msg.uint16(), msg.uint8());
							} else if(type == OD_END) {
								break;
							} else {
								throw(new MessageException("Unknown objdelta type: " + type, msg));
>>>>>>> 9a65d10acd9caf2aa801c8494fd981939675abc7
							}
							oc.layers(id, frame, types, layers);
						} else if(type == OD_DRAWOFF) {
Solution content
							List layers = new LinkedList();
							while(true) {
								int rtype = msg.uint8();
								String layer = msg.string();
								if(layer.equals(""))
									break;
								types.add(rtype);
								layers.add(layer);
							}
							if(type == OD_LAYERS)
								oc.layers(id, frame, types, layers);
							else
								oc.avatar(id, frame, types, layers);
						} else if(type == OD_DRAWOFF) {
File
Session.java
Developer's decision
Combination
Kind of conflict
Break statement
If statement
Method invocation
Throw statement
Variable
While statement