Revert "Merge branch 'master' into master"

This reverts commit 43520c1958, reversing
changes made to 2e7aea3c62.
This commit is contained in:
zeruth
2019-06-22 02:38:35 -04:00
parent 43520c1958
commit c655c9f542
224 changed files with 16901 additions and 17108 deletions

View File

@@ -139,40 +139,39 @@ public class FriendSystem {
if(var1 != null) {
Username var2 = new Username(var1, this.loginType);
if(var2.hasCleanName()) {
StringBuilder var3;
StringBuilder var10000;
String var4;
if(this.__e_158()) {
var3 = null;
var10000 = null;
var4 = "Your friend list is full. Max of 200 for free users, and 400 for members";
WorldMapIcon1.method219(30, "", var4);
} else if(Canvas.localPlayer.username.__equals_466(var2)) {
var3 = null;
var10000 = null;
var4 = "You can\'t add yourself to your own friend list";
WorldMapIcon1.method219(30, "", var4);
} else {
Object var5;
Object var10001;
if(this.isFriended(var2, false)) {
var3 = (new StringBuilder()).append(var1);
var5 = null;
var4 = var3.append(" is already on your friend list").toString();
var10000 = (new StringBuilder()).append(var1);
var10001 = null;
var4 = var10000.append(" is already on your friend list").toString();
WorldMapIcon1.method219(30, "", var4);
} else if(this.isIgnored(var2)) {
var3 = new StringBuilder();
var5 = null;
var3 = var3.append("Please remove ").append(var1);
var5 = null;
var4 = var3.append(" from your ignore list first").toString();
var10000 = new StringBuilder();
var10001 = null;
var10000 = var10000.append("Please remove ").append(var1);
var10001 = null;
var4 = var10000.append(" from your ignore list first").toString();
WorldMapIcon1.method219(30, "", var4);
} else {
PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_cn, Client.packetWriter.isaacCipher);
var6.packetBuffer.writeByte(WorldMapRegion.method550(var1));
var6.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.__q_167(var6);
PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_cn, Client.packetWriter.isaacCipher);
var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
var3.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.__q_167(var3);
}
}
}
}
}
@ObfuscatedName("e")
@@ -195,37 +194,33 @@ public class FriendSystem {
if(var1 != null) {
Username var2 = new Username(var1, this.loginType);
if(var2.hasCleanName()) {
StringBuilder var3;
StringBuilder var10000;
String var4;
if(this.__a_160()) {
var3 = null;
var10000 = null;
var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
WorldMapIcon1.method219(30, "", var4);
} else if(Canvas.localPlayer.username.__equals_466(var2)) {
var3 = null;
var10000 = null;
var4 = "You can\'t add yourself to your own ignore list";
WorldMapIcon1.method219(30, "", var4);
} else if(this.isIgnored(var2)) {
class22.method294(var1);
} else if(this.isFriended(var2, false)) {
var10000 = new StringBuilder();
Object var10001 = null;
var10000 = var10000.append("Please remove ").append(var1);
var10001 = null;
var4 = var10000.append(" from your friend list first").toString();
WorldMapIcon1.method219(30, "", var4);
} else {
PacketBufferNode var5;
if(this.isFriended(var2, false)) {
var3 = new StringBuilder();
var5 = null;
var3 = var3.append("Please remove ").append(var1);
var5 = null;
var4 = var3.append(" from your friend list first").toString();
WorldMapIcon1.method219(30, "", var4);
} else {
var5 = Interpreter.method1915(ClientPacket.__gs_ch, Client.packetWriter.isaacCipher);
var5.packetBuffer.writeByte(WorldMapRegion.method550(var1));
var5.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.__q_167(var5);
}
PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_ch, Client.packetWriter.isaacCipher);
var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
var3.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.__q_167(var3);
}
}
}
}
@ObfuscatedName("a")
@@ -259,7 +254,6 @@ public class FriendSystem {
GrandExchangeOffer.method121();
}
}
}
@ObfuscatedName("j")
@@ -283,7 +277,6 @@ public class FriendSystem {
class229.method4512();
}
}
}
@ObfuscatedName("t")