mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 12:59:44 +00:00
More work on inventory stuff, and fix all the broken merge stuff
This commit is contained in:
1 parent
034cdf2860
commit
3636af5b9c
21 files changed
+352
-507
No files matched your search
@@ -108,19 +108,8 @@ public class MailAddress implements INBTTagable, IMailAddress {
|
||||
if (!(o instanceof MailAddress))
|
||||
return false;
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
MailAddress address = (MailAddress) o;
|
||||
return PlayerUtil.isSameGameProfile(address.gameProfile, gameProfile);
|
||||
=======
|
||||
MailAddress other = (MailAddress) o;
|
||||
return isSamePlayer(gameProfile, other.gameProfile);
|
||||
}
|
||||
|
||||
private static boolean isSamePlayer(GameProfile a, GameProfile b) {
|
||||
if (a.getId() != null && b.getId() != null)
|
||||
return a.getId().equals(b.getId());
|
||||
return a.getName() != null && a.getName().equals(b.getName());
|
||||
>>>>>>> Stashed changes
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user