X-Git-Url: https://git.pterodactylus.net/?p=WoTNS.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fwotns%2Fmain%2FResolver.java;h=0d94ce22fa07831be5fdcdc6d58a9df0bb92b61c;hp=7ec725c2c7ac1b51c1743432b3cb11b9af474411;hb=6328a49176de53708653299833bc4739dd9caacf;hpb=b616c31f048bfc4c4623503542bc9baac7fec198

diff --git a/src/main/java/net/pterodactylus/wotns/main/Resolver.java b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
index 7ec725c..0d94ce2 100644
--- a/src/main/java/net/pterodactylus/wotns/main/Resolver.java
+++ b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
@@ -46,6 +46,10 @@ public class Resolver {
 		this.identityManager = identityManager;
 	}
 
+	public String getOwnIdentityId() {
+		return ownIdentityId;
+	}
+
 	public void setOwnIdentityId(String ownIdentityId) {
 		this.ownIdentityId = ownIdentityId;
 	}
@@ -83,7 +87,9 @@ public class Resolver {
 		}
 		@SuppressWarnings("hiding")
 		final OwnIdentity ownIdentity;
-		if (this.ownIdentityId == null) {
+		if ((this.ownIdentityId != null) && (identityManager.getOwnIdentity(this.ownIdentityId) != null)) {
+			ownIdentity = identityManager.getOwnIdentity(this.ownIdentityId);
+		} else if (this.ownIdentityId == null) {
 			Set<OwnIdentity> ownIdentities = identityManager.getAllOwnIdentities();
 			if (!ownIdentities.isEmpty()) {
 				ownIdentity = ownIdentities.iterator().next();
@@ -91,13 +97,13 @@ public class Resolver {
 				ownIdentity = null;
 			}
 		} else {
-			ownIdentity = identityManager.getOwnIdentity(ownIdentityId);
+			ownIdentity = null;
 		}
 		if (ownIdentity == null) {
 			return null;
 		}
 		System.out.println("using own identity " + ownIdentity + " to resolve " + shortName);
-		Set<Identity> trustedIdentities = Default.forNull(identityManager.getTrustedIdentities(ownIdentity), Collections.<Identity>emptySet());
+		Set<Identity> trustedIdentities = Default.forNull(identityManager.getTrustedIdentities(ownIdentity), Collections.<Identity> emptySet());
 		List<Identity> matchingIdentities = new ArrayList<Identity>();
 		System.out.println("checking " + trustedIdentities);
 		for (Identity identity : trustedIdentities) {