JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated craftbukkit.

Browse Source
This commit is contained in:
Jonathan Williams 2013-09-03 17:29:50 -07:00
parent 346bdb030e
commit 5a30173aba
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/BuildFiles/common.xml
View File

@ -229,7 +229,7 @@
<copy file="../bin/MineKart.jar" todir="../../Testing/MineKart/plugins"/>
</target>
<target name="NautilusCraftBukkit2" description="NautilusCraftBukkit2">
<copy file="../Libraries/craftbukkit.jar" todir="../bin/" overwrite="true"/>
<copy file="../Libraries/craftbukkit_official.jar" tofile="../bin/craftbukkit.jar" overwrite="true"/>
<jar jarfile="../bin/craftbukkit.jar" update="true">
<fileset dir="../Nautilus.Core.CraftBukkit/bin">
<include name="**/*.class"/>
@ -239,6 +239,7 @@
</manifest>
<zipfileset src="../Libraries/jopt-simple-3.2.jar" />
</jar>
<copy file="../bin/craftbukkit.jar" todir="../Libraries/"/>
</target>
</project>

BIN
Plugins/Libraries/craftbukkit.jar
View File

Binary file not shown.

BIN
Plugins/Libraries/craftbukkit_official.jar
View File

Binary file not shown.

3
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R2/PendingConnection.java
View File

@ -63,6 +63,9 @@ public class PendingConnection extends Connection {
public void a(Packet2Handshake packet2handshake) {
// CraftBukkit start
if (this.g != null) {
this.disconnect("Invalid username " + this.g);
}
this.hostname = packet2handshake.c == null ? "" : packet2handshake.c + ':' + packet2handshake.d;
// CraftBukkit end
this.g = packet2handshake.f();

10
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R2/PlayerConnection.java
View File

@ -717,14 +717,6 @@ public class PlayerConnection extends Connection {
if (i == 1 && !packet3chat.isServer()) {
return;
}
// CraftBukkit start
String message = packet3chat.message;
for (final String line : org.bukkit.craftbukkit.v1_6_R2.TextWrapper.wrapText(message)) {
this.networkManager.queue(new Packet3Chat(line));
}
return;
// CraftBukkit end
}
// CraftBukkit start
@ -832,7 +824,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit start
if (this.player.getChatFlags() == 1 && !s.startsWith("/")) {
this.sendPacket(new Packet3Chat("Cannot send chat message."));
this.sendPacket(new Packet3Chat(ChatMessage.e("chat.cannotSend").a(EnumChatFormat.RED)));
return;
}