SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Fix encoding in net.minecraft.server files.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Daniel Chesters 2011-02-19 21:29:51 +01:00 committet von Erik Broes
Ursprung 5121ebb65d
Commit 4f249b585c
3 geänderte Dateien mit 16 neuen und 16 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
src/main/java/net/minecraft/server/MinecraftServer.java
Datei anzeigen

@ -398,11 +398,11 @@ public class MinecraftServer implements ICommandListener, Runnable {
s2 = s.substring(s.indexOf(" ")).trim(); s2 = s.substring(s.indexOf(" ")).trim();
this.f.e(s2); this.f.e(s2);
this.a(s1, "Opping " + s2); this.a(s1, "Opping " + s2);
this.f.a(s2, "§eYou are now op!"); this.f.a(s2, "\u00A7eYou are now op!");
} else if (s.toLowerCase().startsWith("deop ")) { } else if (s.toLowerCase().startsWith("deop ")) {
s2 = s.substring(s.indexOf(" ")).trim(); s2 = s.substring(s.indexOf(" ")).trim();
this.f.f(s2); this.f.f(s2);
this.f.a(s2, "§eYou are no longer op!"); this.f.a(s2, "\u00A7eYou are no longer op!");
this.a(s1, "De-opping " + s2); this.a(s1, "De-opping " + s2);
} else if (s.toLowerCase().startsWith("ban-ip ")) { } else if (s.toLowerCase().startsWith("ban-ip ")) {
s2 = s.substring(s.indexOf(" ")).trim(); s2 = s.substring(s.indexOf(" ")).trim();
@ -507,14 +507,14 @@ public class MinecraftServer implements ICommandListener, Runnable {
} else if (s.toLowerCase().startsWith("say ")) { } else if (s.toLowerCase().startsWith("say ")) {
s = s.substring(s.indexOf(" ")).trim(); s = s.substring(s.indexOf(" ")).trim();
a.info("[" + s1 + "] " + s); a.info("[" + s1 + "] " + s);
this.f.a((Packet) (new Packet3Chat("§d[Server] " + s))); this.f.a((Packet) (new Packet3Chat("\u00A7d[Server] " + s)));
} else if (s.toLowerCase().startsWith("tell ")) { } else if (s.toLowerCase().startsWith("tell ")) {
astring = s.split(" "); astring = s.split(" ");
if (astring.length >= 3) { if (astring.length >= 3) {
s = s.substring(s.indexOf(" ")).trim(); s = s.substring(s.indexOf(" ")).trim();
s = s.substring(s.indexOf(" ")).trim(); s = s.substring(s.indexOf(" ")).trim();
a.info("[" + s1 + "->" + astring[1] + "] " + s); a.info("[" + s1 + "->" + astring[1] + "] " + s);
s = "§7" + s1 + " whispers " + s; s = "\u00A77" + s1 + " whispers " + s;
a.info(s); a.info(s);
if (!this.f.a(astring[1], (Packet) (new Packet3Chat(s)))) { if (!this.f.a(astring[1], (Packet) (new Packet3Chat(s)))) {
icommandlistener.b("There\'s no player by that name online."); icommandlistener.b("There\'s no player by that name online.");
@ -554,7 +554,7 @@ public class MinecraftServer implements ICommandListener, Runnable {
private void a(String s, String s1) { private void a(String s, String s1) {
String s2 = s + ": " + s1; String s2 = s + ": " + s1;
this.f.i("§7(" + s2 + ")"); this.f.i("\u00A77(" + s2 + ")");
a.info(s2); a.info(s2);
} }

2
src/main/java/net/minecraft/server/NetLoginHandler.java
Datei anzeigen

@ -82,7 +82,7 @@ public class NetLoginHandler extends NetHandler {
// Craftbukkit start // Craftbukkit start
netserverhandler.b((Packet) (new Packet1Login("", "", entityplayer.id, entityplayer.world.u, (byte) entityplayer.world.q.g))); netserverhandler.b((Packet) (new Packet1Login("", "", entityplayer.id, entityplayer.world.u, (byte) entityplayer.world.q.g)));
netserverhandler.b((Packet) (new Packet6SpawnPosition(entityplayer.world.spawnX, entityplayer.world.spawnY, entityplayer.world.spawnZ))); netserverhandler.b((Packet) (new Packet6SpawnPosition(entityplayer.world.spawnX, entityplayer.world.spawnY, entityplayer.world.spawnZ)));
this.e.f.a((Packet) (new Packet3Chat("§e" + entityplayer.name + " joined the game."))); this.e.f.a((Packet) (new Packet3Chat("\u00A7e" + entityplayer.name + " joined the game.")));
this.e.f.a(entityplayer); this.e.f.a(entityplayer);
netserverhandler.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch); netserverhandler.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
this.e.c.a(netserverhandler); this.e.c.a(netserverhandler);

10
src/main/java/net/minecraft/server/NetServerHandler.java
Datei anzeigen

@ -83,7 +83,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
public void a(String s) { public void a(String s) {
// CraftBukkit start // CraftBukkit start
String leaveMessage = "§e" + this.e.name + " left the game."; String leaveMessage = "\u00A7e" + this.e.name + " left the game.";
PlayerKickEvent kickEvent = new PlayerKickEvent(org.bukkit.event.Event.Type.PLAYER_KICK, server.getPlayer(this.e), s, leaveMessage); PlayerKickEvent kickEvent = new PlayerKickEvent(org.bukkit.event.Event.Type.PLAYER_KICK, server.getPlayer(this.e), s, leaveMessage);
server.getPluginManager().callEvent(kickEvent); server.getPluginManager().callEvent(kickEvent);
if (kickEvent.isCancelled()) { if (kickEvent.isCancelled()) {
@ -551,7 +551,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
public void a(String s, Object[] aobject) { public void a(String s, Object[] aobject) {
a.info(this.e.name + " lost connection: " + s); a.info(this.e.name + " lost connection: " + s);
this.d.f.a((Packet) (new Packet3Chat("§e" + this.e.name + " left the game."))); this.d.f.a((Packet) (new Packet3Chat("\u00A7e" + this.e.name + " left the game.")));
this.d.f.c(this.e); this.d.f.c(this.e);
this.c = true; this.c = true;
} }
@ -669,10 +669,10 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
if (astring.length >= 3) { if (astring.length >= 3) {
s = s.substring(s.indexOf(" ")).trim(); s = s.substring(s.indexOf(" ")).trim();
s = s.substring(s.indexOf(" ")).trim(); s = s.substring(s.indexOf(" ")).trim();
s = "§7" + this.e.name + " whispers " + s; s = "\u00A77" + this.e.name + " whispers " + s;
a.info(s + " to " + astring[1]); a.info(s + " to " + astring[1]);
if (!this.d.f.a(astring[1], (Packet) (new Packet3Chat(s)))) { if (!this.d.f.a(astring[1], (Packet) (new Packet3Chat(s)))) {
this.b((Packet) (new Packet3Chat("§cThere\'s no player by that name online."))); this.b((Packet) (new Packet3Chat("\u00A7cThere\'s no player by that name online.")));
} }
} }
} else { } else {
@ -729,7 +729,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
} }
public void b(String s) { public void b(String s) {
this.b((Packet) (new Packet3Chat("§7" + s))); this.b((Packet) (new Packet3Chat("\u00A77" + s)));
} }
public String c() { public String c() {