Skip to content

Commit 3f6cb64

Browse files
WolverenessWolvereness
committed
Update to 1.7.9
1 parent caad082 commit 3f6cb64

11 files changed

+100
-145
lines changed

‎net/minecraft/server/CrashReportVersion.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class CrashReportVersion implements Callable {
1111
}
1212

1313
public String a() {
14-
return "1.7.8";
14+
return "1.7.9";
1515
}
1616

1717
public Object call() {

‎net/minecraft/server/DedicatedServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected boolean init() {
3434

3535
threadcommandreader.setDaemon(true);
3636
threadcommandreader.start();
37-
i.info("Starting minecraft server version 1.7.8");
37+
i.info("Starting minecraft server version 1.7.9");
3838
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
3939
i.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
4040
}

‎net/minecraft/server/HandshakeListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ public void a(PacketHandshakingInSetProtocol packethandshakinginsetprotocol) {
1919
ChatComponentText chatcomponenttext;
2020

2121
if (packethandshakinginsetprotocol.d() > 5) {
22-
chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.8");
22+
chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.9");
2323
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
2424
this.b.close(chatcomponenttext);
2525
} else if (packethandshakinginsetprotocol.d() < 5) {
26-
chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.8");
26+
chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.9");
2727
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
2828
this.b.close(chatcomponenttext);
2929
} else {

‎net/minecraft/server/ItemEnderEye.java

+27-27
Original file line numberDiff line numberDiff line change
@@ -42,58 +42,58 @@ public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World
4242
int k2;
4343
int l2;
4444

45-
for (l2 = -2; l2 <= 2; ++l2) {
46-
j2 = i + Direction.a[i2] * l2;
47-
k2 = k + Direction.b[i2] * l2;
48-
if (world.getType(j2, j, k2) == Blocks.ENDER_PORTAL_FRAME) {
49-
if (!BlockEnderPortalFrame.b(world.getData(j2, j, k2))) {
45+
for (j2 = -2; j2 <= 2; ++j2) {
46+
k2 = i + Direction.a[i2] * j2;
47+
l2 = k + Direction.b[i2] * j2;
48+
if (world.getType(k2, j, l2) == Blocks.ENDER_PORTAL_FRAME) {
49+
if (!BlockEnderPortalFrame.b(world.getData(k2, j, l2))) {
5050
flag1 = false;
5151
break;
5252
}
5353

54-
l1 = l2;
54+
l1 = j2;
5555
if (!flag) {
56-
k1 = l2;
56+
k1 = j2;
5757
flag = true;
5858
}
5959
}
6060
}
6161

6262
if (flag1 && l1 == k1 + 2) {
63-
for (l2 = k1; l2 <= l1; ++l2) {
64-
j2 = i + Direction.a[i2] * l2;
65-
k2 = k + Direction.b[i2] * l2;
66-
j2 += Direction.a[j1] * 4;
67-
k2 += Direction.b[j1] * 4;
68-
if (world.getType(j2, j, k2) != Blocks.ENDER_PORTAL_FRAME || !BlockEnderPortalFrame.b(world.getData(j2, j, k2))) {
63+
for (j2 = k1; j2 <= l1; ++j2) {
64+
k2 = i + Direction.a[i2] * j2;
65+
l2 = k + Direction.b[i2] * j2;
66+
k2 += Direction.a[j1] * 4;
67+
l2 += Direction.b[j1] * 4;
68+
if (world.getType(k2, j, l2) != Blocks.ENDER_PORTAL_FRAME || !BlockEnderPortalFrame.b(world.getData(k2, j, l2))) {
6969
flag1 = false;
7070
break;
7171
}
7272
}
7373

7474
int i3;
7575

76-
for (l2 = k1 - 1; l2 <= l1 + 1; l2 += 4) {
77-
for (j2 = 1; j2 <= 3; ++j2) {
78-
k2 = i + Direction.a[i2] * l2;
79-
i3 = k + Direction.b[i2] * l2;
80-
k2 += Direction.a[j1] * j2;
81-
i3 += Direction.b[j1] * j2;
82-
if (world.getType(k2, j, i3) != Blocks.ENDER_PORTAL_FRAME || !BlockEnderPortalFrame.b(world.getData(k2, j, i3))) {
76+
for (j2 = k1 - 1; j2 <= l1 + 1; j2 += 4) {
77+
for (k2 = 1; k2 <= 3; ++k2) {
78+
l2 = i + Direction.a[i2] * j2;
79+
i3 = k + Direction.b[i2] * j2;
80+
l2 += Direction.a[j1] * k2;
81+
i3 += Direction.b[j1] * k2;
82+
if (world.getType(l2, j, i3) != Blocks.ENDER_PORTAL_FRAME || !BlockEnderPortalFrame.b(world.getData(l2, j, i3))) {
8383
flag1 = false;
8484
break;
8585
}
8686
}
8787
}
8888

8989
if (flag1) {
90-
for (l2 = k1; l2 <= l1; ++l2) {
91-
for (j2 = 1; j2 <= 3; ++j2) {
92-
k2 = i + Direction.a[i2] * l2;
93-
i3 = k + Direction.b[i2] * l2;
94-
k2 += Direction.a[j1] * j2;
95-
i3 += Direction.b[j1] * j2;
96-
world.setTypeAndData(k2, j, i3, Blocks.ENDER_PORTAL, 0, 2);
90+
for (j2 = k1; j2 <= l1; ++j2) {
91+
for (k2 = 1; k2 <= 3; ++k2) {
92+
l2 = i + Direction.a[i2] * j2;
93+
i3 = k + Direction.b[i2] * j2;
94+
l2 += Direction.a[j1] * k2;
95+
i3 += Direction.b[j1] * k2;
96+
world.setTypeAndData(l2, j, i3, Blocks.ENDER_PORTAL, 0, 2);
9797
}
9898
}
9999
}

‎net/minecraft/server/LegacyPingHandler.java

+52-50
Original file line numberDiff line numberDiff line change
@@ -27,62 +27,64 @@ public void channelRead(ChannelHandlerContext channelhandlercontext, Object obje
2727
boolean flag = true;
2828

2929
try {
30-
if (bytebuf.readUnsignedByte() != 254) {
31-
return;
32-
}
33-
34-
InetSocketAddress inetsocketaddress = (InetSocketAddress) channelhandlercontext.channel().remoteAddress();
35-
MinecraftServer minecraftserver = this.b.d();
36-
int i = bytebuf.readableBytes();
37-
String s;
38-
39-
switch (i) {
40-
case 0:
41-
a.debug("Ping: (<1.3.x) from {}:{}", new Object[] { inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())});
42-
s = String.format("%s�%d�%d", new Object[] { minecraftserver.getMotd(), Integer.valueOf(minecraftserver.C()), Integer.valueOf(minecraftserver.D())});
43-
this.a(channelhandlercontext, this.a(s));
44-
break;
45-
46-
case 1:
47-
if (bytebuf.readUnsignedByte() != 1) {
30+
try {
31+
if (bytebuf.readUnsignedByte() != 254) {
4832
return;
4933
}
5034

51-
a.debug("Ping: (1.4-1.5.x) from {}:{}", new Object[] { inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())});
52-
s = String.format("�1, new Object[] { Integer.valueOf(127), minecraftserver.getVersion(), minecraftserver.getMotd(), Integer.valueOf(minecraftserver.C()), Integer.valueOf(minecraftserver.D())});
53-
this.a(channelhandlercontext, this.a(s));
54-
break;
55-
56-
default:
57-
boolean flag1 = bytebuf.readUnsignedByte() == 1;
58-
59-
flag1 &= bytebuf.readUnsignedByte() == 250;
60-
flag1 &= "MC|PingHost".equals(new String(bytebuf.readBytes(bytebuf.readShort() * 2).array(), Charsets.UTF_16BE));
61-
int j = bytebuf.readUnsignedShort();
62-
63-
flag1 &= bytebuf.readUnsignedByte() >= 73;
64-
flag1 &= 3 + bytebuf.readBytes(bytebuf.readShort() * 2).array().length + 4 == j;
65-
flag1 &= bytebuf.readInt() <= '\uffff';
66-
flag1 &= bytebuf.readableBytes() == 0;
67-
if (!flag1) {
68-
return;
35+
InetSocketAddress inetsocketaddress = (InetSocketAddress) channelhandlercontext.channel().remoteAddress();
36+
MinecraftServer minecraftserver = this.b.d();
37+
int i = bytebuf.readableBytes();
38+
String s;
39+
40+
switch (i) {
41+
case 0:
42+
a.debug("Ping: (<1.3.x) from {}:{}", new Object[] { inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())});
43+
s = String.format("%s�%d�%d", new Object[] { minecraftserver.getMotd(), Integer.valueOf(minecraftserver.C()), Integer.valueOf(minecraftserver.D())});
44+
this.a(channelhandlercontext, this.a(s));
45+
break;
46+
47+
case 1:
48+
if (bytebuf.readUnsignedByte() != 1) {
49+
return;
50+
}
51+
52+
a.debug("Ping: (1.4-1.5.x) from {}:{}", new Object[] { inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())});
53+
s = String.format("�1, new Object[] { Integer.valueOf(127), minecraftserver.getVersion(), minecraftserver.getMotd(), Integer.valueOf(minecraftserver.C()), Integer.valueOf(minecraftserver.D())});
54+
this.a(channelhandlercontext, this.a(s));
55+
break;
56+
57+
default:
58+
boolean flag1 = bytebuf.readUnsignedByte() == 1;
59+
60+
flag1 &= bytebuf.readUnsignedByte() == 250;
61+
flag1 &= "MC|PingHost".equals(new String(bytebuf.readBytes(bytebuf.readShort() * 2).array(), Charsets.UTF_16BE));
62+
int j = bytebuf.readUnsignedShort();
63+
64+
flag1 &= bytebuf.readUnsignedByte() >= 73;
65+
flag1 &= 3 + bytebuf.readBytes(bytebuf.readShort() * 2).array().length + 4 == j;
66+
flag1 &= bytebuf.readInt() <= '\uffff';
67+
flag1 &= bytebuf.readableBytes() == 0;
68+
if (!flag1) {
69+
return;
70+
}
71+
72+
a.debug("Ping: (1.6) from {}:{}", new Object[] { inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())});
73+
String s1 = String.format("�1, new Object[] { Integer.valueOf(127), minecraftserver.getVersion(), minecraftserver.getMotd(), Integer.valueOf(minecraftserver.C()), Integer.valueOf(minecraftserver.D())});
74+
ByteBuf bytebuf1 = this.a(s1);
75+
76+
try {
77+
this.a(channelhandlercontext, bytebuf1);
78+
} finally {
79+
bytebuf1.release();
80+
}
6981
}
7082

71-
a.debug("Ping: (1.6) from {}:{}", new Object[] { inetsocketaddress.getAddress(), Integer.valueOf(inetsocketaddress.getPort())});
72-
String s1 = String.format("�1, new Object[] { Integer.valueOf(127), minecraftserver.getVersion(), minecraftserver.getMotd(), Integer.valueOf(minecraftserver.C()), Integer.valueOf(minecraftserver.D())});
73-
ByteBuf bytebuf1 = this.a(s1);
74-
75-
try {
76-
this.a(channelhandlercontext, bytebuf1);
77-
} finally {
78-
bytebuf1.release();
79-
}
83+
bytebuf.release();
84+
flag = false;
85+
} catch (RuntimeException runtimeexception) {
86+
;
8087
}
81-
82-
bytebuf.release();
83-
flag = false;
84-
} catch (RuntimeException runtimeexception) {
85-
;
8688
} finally {
8789
if (flag) {
8890
bytebuf.resetReaderIndex();

‎net/minecraft/server/MinecraftServer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public void run() {
293293
long j = 0L;
294294

295295
this.q.setMOTD(new ChatComponentText(this.motd));
296-
this.q.setServerInfo(new ServerPingServerData("1.7.8", 5));
296+
this.q.setServerInfo(new ServerPingServerData("1.7.9", 5));
297297
this.a(this.q);
298298

299299
while (this.isRunning) {
@@ -626,7 +626,7 @@ public String A() {
626626
}
627627

628628
public String getVersion() {
629-
return "1.7.8";
629+
return "1.7.9";
630630
}
631631

632632
public int C() {

‎net/minecraft/server/MojangStatisticsGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private void h() {
5252
this.b("os_version", System.getProperty("os.version"));
5353
this.b("os_architecture", System.getProperty("os.arch"));
5454
this.b("java_version", System.getProperty("java.version"));
55-
this.b("version", "1.7.8");
55+
this.b("version", "1.7.9");
5656
this.e.b(this);
5757
}
5858

‎net/minecraft/server/NBTBase.java

-46
Original file line numberDiff line numberDiff line change
@@ -60,52 +60,6 @@ protected static NBTBase createTag(byte b0) {
6060
}
6161
}
6262

63-
public static String getTagName(int i) {
64-
switch (i) {
65-
case 0:
66-
return "TAG_End";
67-
68-
case 1:
69-
return "TAG_Byte";
70-
71-
case 2:
72-
return "TAG_Short";
73-
74-
case 3:
75-
return "TAG_Int";
76-
77-
case 4:
78-
return "TAG_Long";
79-
80-
case 5:
81-
return "TAG_Float";
82-
83-
case 6:
84-
return "TAG_Double";
85-
86-
case 7:
87-
return "TAG_Byte_Array";
88-
89-
case 8:
90-
return "TAG_String";
91-
92-
case 9:
93-
return "TAG_List";
94-
95-
case 10:
96-
return "TAG_Compound";
97-
98-
case 11:
99-
return "TAG_Int_Array";
100-
101-
case 99:
102-
return "Any Numeric Tag";
103-
104-
default:
105-
return "UNKNOWN";
106-
}
107-
}
108-
10963
public abstract NBTBase clone();
11064

11165
public boolean equals(Object object) {

‎net/minecraft/server/NBTTagCompound.java

+1-11
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,7 @@ public boolean hasKey(String s) {
120120
public boolean hasKeyOfType(String s, int i) {
121121
byte b0 = this.b(s);
122122

123-
if (b0 == i) {
124-
return true;
125-
} else if (i != 99) {
126-
if (b0 > 0) {
127-
b.warn("NBT tag {} was of wrong type; expected {}, found {}", new Object[] { s, getTagName(i), getTagName(b0)});
128-
}
129-
130-
return false;
131-
} else {
132-
return b0 == 1 || b0 == 2 || b0 == 3 || b0 == 4 || b0 == 5 || b0 == 6;
133-
}
123+
return b0 == i ? true : (i != 99 ? false : b0 == 1 || b0 == 2 || b0 == 3 || b0 == 4 || b0 == 5 || b0 == 6);
134124
}
135125

136126
public byte getByte(String s) {

‎net/minecraft/server/NetworkManager.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.minecraft.util.io.netty.channel.local.LocalChannel;
1414
import net.minecraft.util.io.netty.channel.local.LocalServerChannel;
1515
import net.minecraft.util.io.netty.channel.nio.NioEventLoopGroup;
16+
import net.minecraft.util.io.netty.handler.timeout.TimeoutException;
1617
import net.minecraft.util.io.netty.util.AttributeKey;
1718
import net.minecraft.util.io.netty.util.concurrent.GenericFutureListener;
1819
import net.minecraft.util.org.apache.commons.lang3.Validate;
@@ -66,7 +67,15 @@ public void channelInactive(ChannelHandlerContext channelhandlercontext) {
6667
}
6768

6869
public void exceptionCaught(ChannelHandlerContext channelhandlercontext, Throwable throwable) {
69-
this.close(new ChatMessage("disconnect.genericReason", new Object[] { "Internal Exception: " + throwable}));
70+
ChatMessage chatmessage;
71+
72+
if (throwable instanceof TimeoutException) {
73+
chatmessage = new ChatMessage("disconnect.timeout", new Object[0]);
74+
} else {
75+
chatmessage = new ChatMessage("disconnect.genericReason", new Object[] { "Internal Exception: " + throwable});
76+
}
77+
78+
this.close(chatmessage);
7079
}
7180

7281
protected void a(ChannelHandlerContext channelhandlercontext, Packet packet) {

‎net/minecraft/server/PacketSplitter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ protected void decode(ChannelHandlerContext channelhandlercontext, ByteBuf byteb
2929
try {
3030
int j = packetdataserializer.a();
3131

32-
if (bytebuf.readableBytes() >= j) {
33-
list.add(bytebuf.readBytes(j));
32+
if (bytebuf.readableBytes() < j) {
33+
bytebuf.resetReaderIndex();
3434
return;
3535
}
3636

37-
bytebuf.resetReaderIndex();
37+
list.add(bytebuf.readBytes(j));
3838
} finally {
3939
packetdataserializer.release();
4040
}

0 commit comments

Comments
 (0)