Projects >> LoginMessage >>cb99d1082d85bde45d1b692393e80c540193aac0

Chunk
Conflicting content 
							      } else {
				str = str.replaceAll("%bal", "");
			}
			Holdings balance = iConomy.getAccount(player.getName()).getHoldings();
<<<<<<< HEAD
			str = str.replaceAll("%bal", balance.toString());
		}
		if (plugin.PermissionsEnabled()) {
			PermissionHandler handler = Main.getPermissions();
			String groupname = handler.getGroup(player.getWorld().getName(),
					player.getName());
			str = str.replaceAll("%group", groupname);

			if (handler.getGroupPrefix(player.getWorld().getName(), groupname) != null || handler.getGroupSuffix(player.getWorld().getName(), groupname) != null) {
				String prefix = handler.getGroupPrefix(player.getWorld().getName(), groupname);
				String suffix = handler.getGroupSuffix(player.getWorld().getName(), groupname);
				String permissionslist = "";
				int length1 = online.length - 1;
				int on1 = 0;
				for (Player current : online) {
					if (current == null) {
						on1++;
					} else {
						String prefix2 = handler.getGroupPrefix(current.getWorld().getName(), handler.getGroup(current.getWorld().getName(), current.getName()));
						String suffix2 = handler.getGroupSuffix(current.getWorld().getName(), handler.getGroup(current.getWorld().getName(), current.getName()));
						permissionslist = permissionslist + (on1 >= length1 ? prefix2 + current.getName() + suffix2 : new StringBuilder().append(prefix2).append(current.getName()).append(suffix2).append(", ").toString());
						on1++;
					}
				}
				str = str.replaceAll("%prefix", prefix);
				str = str.replaceAll("%suffix", suffix);
				str = str.replaceAll("%perol", permissionslist);
			}
		}
		String ip = player.getAddress().getAddress().getHostAddress();
		if (!isLocal(player)) {
			str = str.replaceAll("%ip", ip);
		} else {
			str = str.replaceAll("%ip", Main.getExternalIp().getHostAddress());
		}
		if(str.contains("%city")) {
			str = str.replaceAll("%city", getLocation("city", player, event));
		}
		if(str.contains("%ccode")) {
			str = str.replaceAll("%ccode", getLocation("ccode", player, event));
		}
		if(str.contains("%cname")) {
			str = str.replaceAll("%cname", getLocation("cname", player, event));
		}
		if(str.contains("%zip")) {
			str = str.replaceAll("%zip", getLocation("zip", player, event));
		}
		if(str.contains("%rcode")) {
			str = str.replaceAll("%rcode", getLocation("rcode", player, event));
		}
		if(str.contains("%rname")) {
			str = str.replaceAll("%rname", getLocation("rname", player, event));
		}
		Long rawtime = player.getWorld().getTime();
		Calendar cal = Calendar.getInstance();
		SimpleDateFormat sdf = new SimpleDateFormat(config.getString("format"));
		str = str.replaceAll("%world", player.getWorld().getName());
		str = str.replaceAll("%rtime", rawtime.toString());
		str = str.replaceAll("%time", getTime(rawtime, false));
		str = str.replaceAll("%Time", getTime(rawtime, true));
		str = str.replaceAll("%srtime", sdf.format(cal.getTime()));
		str = str.replaceAll("(&([a-z0-9]))", SECTION_SIGN + "$2");
		str = str.replaceAll("%sp", "");
		return str;
	}

	public boolean isLocal(Player p) {
		boolean r = false;
		try {
			String localip = InetAddress.getLocalHost().getHostAddress();
			String ip = p.getAddress().getAddress().getHostAddress();
			String shortlocalip = localip.substring(0, localip.length() - 3); // The last 3 indexes
			String shortip = ip.substring(0, ip.length() - 3); // could differ, so we exclude them
			
			if(shortlocalip.contains(shortip) || shortip.contains(shortlocalip)) {
				r = true;
			}
		} catch (UnknownHostException e) {
		}
		return r;
	}
	/**
	 * Gets receivers or triggers.
	 * @param trigger
	 * 			the player triggering the event
	 * @param key
	 * 			the name of the message
	 * @param event
	 * 			the event type
	 * @param type
	 * 			the type of entries to get (receivers/triggers)
	 * @return the set of entries
	 */
	public Set getEntries(Player trigger, String key, String event, String type)
=======
	        str = str.replaceAll("%bal", balance.toString());
	      }
	      if (plugin.PermissionsEnabled())
	      {
	    	PermissionHandler handler = Main.getPermissions();
	        String groupname = handler.getGroup(player.getWorld().getName(), player.getName());
	        str = str.replaceAll("%group", groupname);
	        
	        if (handler.getGroupPrefix(player.getWorld().getName(), groupname) != null || handler.getGroupSuffix(player.getWorld().getName(), groupname) != null)
	        {
	          String prefix = handler.getGroupPrefix(player.getWorld().getName(), groupname);
	          String suffix = handler.getGroupSuffix(player.getWorld().getName(), groupname);
	          String permissionslist = "";
	          int length1 = online.length - 1;
	          int on1 = 0;
	          for (Player current : online) {
	            if (current == null)
	            {
	            	on1++;
	            }
	            else
	            {
	              String prefix2 = handler.getGroupPrefix(current.getWorld().getName(), handler.getGroup(current.getWorld().getName(), current.getName()));
	              String suffix2 = handler.getGroupSuffix(current.getWorld().getName(), handler.getGroup(current.getWorld().getName(), current.getName()));
	              permissionslist = permissionslist + (on1 >= length1 ? prefix2 + current.getName() + suffix2 : new StringBuilder().append(prefix2).append(current.getName()).append(suffix2).append(", ").toString());
	              on1++;
	            }
	          }
	          str = str.replaceAll("%prefix", prefix);
	          str = str.replaceAll("%suffix", suffix);
	          str = str.replaceAll("%perol", permissionslist);
	        }
	      }
	      String ip = player.getAddress().getAddress().getHostAddress();
	      if(!plugin.isLocal(player)){
	    	  str = str.replaceAll("%ip", ip);
	    	  }
	      else if(str.contains("%ip"))
	      {
	    	  str = str.replaceAll("%ip", Main.getExternalIp().getHostAddress());  
	    	  }
	    	  for(String g : geoipcodes){
	    		  if(str.contains(g)){
	    			  if(geoip.exists()){
				    	  Location loc = null;
				    	  LookupService location = null;
								try {
									location = new LookupService(geoip);
								} catch (IOException e) {
									log.info("[LoginMessage] Could not initiate GeoIP lookup service.");
								}
						      loc = location.getLocation(ip);
							      if(!plugin.isLocal(player)){
								      str = str.replaceAll("%city", loc.city);
								      str = str.replaceAll("%ccode", loc.countryCode);
								      str = str.replaceAll("%cname", loc.countryName);
								      str = str.replaceAll("%zip", loc.postalCode);
								      str = str.replaceAll("%region", loc.region);
								    	  str = str.replaceAll("%city", config.getString("local.city"));
								    	  str = str.replaceAll("%ccode", config.getString("local.countrycode"));
								    	  str = str.replaceAll("%cname", config.getString("local.countryname"));
								    	  str = str.replaceAll("%zip", config.getString("local.zip"));
								    	  str = str.replaceAll("%region", config.getString("local.region"));
								    	  }
							      location.close();
							      }
	    		  }
	    	  }
			      Long rawtime = player.getWorld().getTime();
			      String rtime = rawtime.toString();
			      Calendar cal = Calendar.getInstance();
			      SimpleDateFormat sdf = new SimpleDateFormat(config.getString("format"));
			      str = str.replaceAll("%world", player.getWorld().getName());
			      str = str.replaceAll("%rtime", rtime);
			      str = str.replaceAll("%time", getTime(rawtime, false));
			      str = str.replaceAll("%Time", getTime(rawtime, true));
			      str = str.replaceAll("%srtime", sdf.format(cal.getTime()));
			      str = str.replaceAll("(&([a-z0-9]))", SECTION_SIGN + "$2");
				  str = str.replaceAll("%sp", "");
		  return str;
	  }
	  
	
	public Set getEntries(Player trigger, String key, String event, String type) //For receivers/triggers
>>>>>>> 4f699c1faa7d115d3d53de4fc5bcb473189085dd
	{
		message.load();
		Set entries = new HashSet();
Solution content 
			Holdings balance = iConomy.getAccount(player.getName()).getHoldings();
<<<<<<< HEAD
<<<<<<< HEAD
			str = str.replaceAll("%bal", balance.toString());
		}
		if (plugin.PermissionsEnabled()) {
			PermissionHandler handler = Main.getPermissions();
			String groupname = handler.getGroup(player.getWorld().getName(),
					player.getName());
			str = str.replaceAll("%group", groupname);

			if (handler.getGroupPrefix(player.getWorld().getName(), groupname) != null || handler.getGroupSuffix(player.getWorld().getName(), groupname) != null) {
				String prefix = handler.getGroupPrefix(player.getWorld().getName(), groupname);
				String suffix = handler.getGroupSuffix(player.getWorld().getName(), groupname);
				String permissionslist = "";
				int length1 = online.length - 1;
				int on1 = 0;
				for (Player current : online) {
					if (current == null) {
						on1++;
					} else {
						String prefix2 = handler.getGroupPrefix(current.getWorld().getName(), handler.getGroup(current.getWorld().getName(), current.getName()));
						String suffix2 = handler.getGroupSuffix(current.getWorld().getName(), handler.getGroup(current.getWorld().getName(), current.getName()));
						permissionslist = permissionslist + (on1 >= length1 ? prefix2 + current.getName() + suffix2 : new StringBuilder().append(prefix2).append(current.getName()).append(suffix2).append(", ").toString());
						on1++;
					}
				}
				str = str.replaceAll("%prefix", prefix);
				str = str.replaceAll("%suffix", suffix);
				str = str.replaceAll("%perol", permissionslist);
			}
		}
		String ip = player.getAddress().getAddress().getHostAddress();
		if (!isLocal(player)) {
			str = str.replaceAll("%ip", ip);
		} else {
			str = str.replaceAll("%ip", Main.getExternalIp().getHostAddress());
		}
		if(str.contains("%city")) {
			str = str.replaceAll("%city", getLocation("city", player, event));
		}
		if(str.contains("%ccode")) {
			str = str.replaceAll("%ccode", getLocation("ccode", player, event));
		}
		if(str.contains("%cname")) {
			str = str.replaceAll("%cname", getLocation("cname", player, event));
		}
		if(str.contains("%zip")) {
			str = str.replaceAll("%zip", getLocation("zip", player, event));
		}
		if(str.contains("%rcode")) {
			str = str.replaceAll("%rcode", getLocation("rcode", player, event));
		}
		if(str.contains("%rname")) {
			str = str.replaceAll("%rname", getLocation("rname", player, event));
		}
		Long rawtime = player.getWorld().getTime();
		Calendar cal = Calendar.getInstance();
		SimpleDateFormat sdf = new SimpleDateFormat(config.getString("format"));
		str = str.replaceAll("%world", player.getWorld().getName());
		str = str.replaceAll("%rtime", rawtime.toString());
		str = str.replaceAll("%time", getTime(rawtime, false));
		str = str.replaceAll("%Time", getTime(rawtime, true));
		str = str.replaceAll("%srtime", sdf.format(cal.getTime()));
		str = str.replaceAll("(&([a-z0-9]))", SECTION_SIGN + "$2");
		str = str.replaceAll("%sp", "");
		return str;
	}

	public boolean isLocal(Player p) {
		boolean r = false;
		try {
			String localip = InetAddress.getLocalHost().getHostAddress();
			String ip = p.getAddress().getAddress().getHostAddress();
			String shortlocalip = localip.substring(0, localip.length() - 3); // The last 3 indexes
			String shortip = ip.substring(0, ip.length() - 3); // could differ, so we exclude them
			
			if(shortlocalip.contains(shortip) || shortip.contains(shortlocalip)) {
				r = true;
			}
		} catch (UnknownHostException e) {
		}
		return r;
	}
	/**
	 * Gets receivers or triggers.
	 * @param trigger
	 * 			the player triggering the event
	 * @param key
	 * 			the name of the message
	 * @param event
	 * 			the event type
	 * @param type
	 * 			the type of entries to get (receivers/triggers)
	 * @return the set of entries
	 */
	public Set getEntries(Player trigger, String key, String event, String type)
=======
=======
>>>>>>> parent of 57b7a9b... Added firstlogin event; fixed NPEs for null messages; started persistence support.
	        str = str.replaceAll("%bal", balance.toString());
	      }
	      if (plugin.PermissionsEnabled())
	      {
	    	PermissionHandler handler = Main.getPermissions();
	        String groupname = handler.getGroup(player.getWorld().getName(), player.getName());
	        str = str.replaceAll("%group", groupname);
	        
	        if (handler.getGroupPrefix(player.getWorld().getName(), groupname) != null || handler.getGroupSuffix(player.getWorld().getName(), groupname) != null)
	        {
	          String prefix = handler.getGroupPrefix(player.getWorld().getName(), groupname);
	          String suffix = handler.getGroupSuffix(player.getWorld().getName(), groupname);
	          String permissionslist = "";
	          int length1 = online.length - 1;
	          int on1 = 0;
	          for (Player current : online) {
	            if (current == null)
	            {
	            	on1++;
	            }
	            else
	            {
	              String prefix2 = handler.getGroupPrefix(current.getWorld().getName(), handler.getGroup(current.getWorld().getName(), current.getName()));
	              String suffix2 = handler.getGroupSuffix(current.getWorld().getName(), handler.getGroup(current.getWorld().getName(), current.getName()));
	              permissionslist = permissionslist + (on1 >= length1 ? prefix2 + current.getName() + suffix2 : new StringBuilder().append(prefix2).append(current.getName()).append(suffix2).append(", ").toString());
	              on1++;
	            }
	          }
	          str = str.replaceAll("%prefix", prefix);
	          str = str.replaceAll("%suffix", suffix);
	          str = str.replaceAll("%perol", permissionslist);
	        }
	      }
	      String ip = player.getAddress().getAddress().getHostAddress();
	      if(!plugin.isLocal(player)){
	    	  str = str.replaceAll("%ip", ip);
	    	  }
	      else if(str.contains("%ip"))
	      {
<<<<<<< HEAD
=======
	    	  System.out.println("contains %ip");
>>>>>>> parent of 57b7a9b... Added firstlogin event; fixed NPEs for null messages; started persistence support.
	    	  str = str.replaceAll("%ip", Main.getExternalIp().getHostAddress());  
	    	  }
	    	  for(String g : geoipcodes){
	    		  if(str.contains(g)){
	    			  if(geoip.exists()){
				    	  Location loc = null;
				    	  LookupService location = null;
								try {
									location = new LookupService(geoip);
								} catch (IOException e) {
									log.info("[LoginMessage] Could not initiate GeoIP lookup service.");
								}
						      loc = location.getLocation(ip);
							      if(!plugin.isLocal(player)){
								      str = str.replaceAll("%city", loc.city);
								      str = str.replaceAll("%ccode", loc.countryCode);
								      str = str.replaceAll("%cname", loc.countryName);
								      str = str.replaceAll("%zip", loc.postalCode);
								      str = str.replaceAll("%region", loc.region);
							      } else {
								    	  str = str.replaceAll("%city", config.getString("local.city"));
								    	  str = str.replaceAll("%ccode", config.getString("local.countrycode"));
								    	  str = str.replaceAll("%cname", config.getString("local.countryname"));
								    	  str = str.replaceAll("%zip", config.getString("local.zip"));
								    	  str = str.replaceAll("%region", config.getString("local.region"));
								    	  }
							      location.close();
							      }
	    		  }
	    	  }
			      Long rawtime = player.getWorld().getTime();
			      String rtime = rawtime.toString();
			      Calendar cal = Calendar.getInstance();
			      SimpleDateFormat sdf = new SimpleDateFormat(config.getString("format"));
			      str = str.replaceAll("%world", player.getWorld().getName());
			      str = str.replaceAll("%rtime", rtime);
			      str = str.replaceAll("%time", getTime(rawtime, false));
			      str = str.replaceAll("%Time", getTime(rawtime, true));
			      str = str.replaceAll("%srtime", sdf.format(cal.getTime()));
			      str = str.replaceAll("(&([a-z0-9]))", SECTION_SIGN + "$2");
				  str = str.replaceAll("%sp", "");
		  return str;
	  }
	  
	
	public Set getEntries(Player trigger, String key, String event, String type) //For receivers/triggers
<<<<<<< HEAD
>>>>>>> 4f699c1faa7d115d3d53de4fc5bcb473189085dd
=======
>>>>>>> parent of 57b7a9b... Added firstlogin event; fixed NPEs for null messages; started persistence support.
	{
		message.load();
		Set entries = new HashSet();
File
Message.java
Developer's decision
Manual
Kind of conflict
Comment
For statement
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
	public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
		message.load();
		Player p = event.getPlayer();
<<<<<<< HEAD
		String msg = event.getMessage();
		String cmd = msg.substring(1); // This is the bare command, without "/"
		if(notNull("command")) {
			List commands = message.getKeys("messages.command");
			for (String key : commands) {
				if (key != null && msg.equalsIgnoreCase("/" + key)) {
					event.setCancelled(true);
					preProcessMessage(p, "command", cmd);
=======
		String cmd = event.getMessage().substring(1); //This is the bare command, without "/"
		List commands = message.getKeys("messages.command");
		if (commands != null) {
			for(String key : commands)
			{
				if(cmd.equalsIgnoreCase(key)) //If what you typed == an LM command message, go right ahead!
				{
					event.setCancelled(true); //TODO If I don't do this, it says "Unknown command". I guess I should use onCommand in Main class?
					preProcessMessage(p, "command", cmd); //Here we actually use that preProcessMessage parameter
>>>>>>> 4f699c1faa7d115d3d53de4fc5bcb473189085dd
					break;
				}
			}
Solution content 
		message.load();
		Player p = event.getPlayer();
<<<<<<< HEAD
		String msg = event.getMessage();
<<<<<<< HEAD
		String cmd = msg.substring(1); // This is the bare command, without "/"
		if(notNull("command")) {
			List commands = message.getKeys("messages.command");
			for (String key : commands) {
				if (key != null && msg.equalsIgnoreCase("/" + key)) {
					event.setCancelled(true);
					preProcessMessage(p, "command", cmd);
=======
		String cmd = event.getMessage().substring(1); //This is the bare command, without "/"
		List commands = message.getKeys("messages.command");
		if (commands != null) {
			for(String key : commands)
			{
				if(cmd.equalsIgnoreCase(key)) //If what you typed == an LM command message, go right ahead!
				{
					event.setCancelled(true); //TODO If I don't do this, it says "Unknown command". I guess I should use onCommand in Main class?
					preProcessMessage(p, "command", cmd); //Here we actually use that preProcessMessage parameter
>>>>>>> 4f699c1faa7d115d3d53de4fc5bcb473189085dd
					break;
				}
=======
		String cmd = msg.substring(1); //This is the bare command, without "/"
		List commands = message.getKeys("messages.command");
		for(String key : commands)
		{
			if(msg.equalsIgnoreCase("/" + key)) //If what you typed == an LM command message, go right ahead!
			{
				event.setCancelled(true); //TODO If I don't do this, it says "Unknown command". I guess I should use onCommand in Main class?
				preProcessMessage(p, "command", cmd); //Here we actually use that preProcessMessage parameter
				break;
>>>>>>> parent of 57b7a9b... Added firstlogin event; fixed NPEs for null messages; started persistence support.
			}
File
Message.java
Developer's decision
Manual
Kind of conflict
Comment
For statement
If statement
Method invocation
Variable