SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.7.5

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 00:06:43 +00:00
parent 2bba2bc54f
commit b215942177
70 changed files with 583 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CraftBukkit-Patches/0037-Configurable-Messages.patch
View File

@@ -1,29 +1,29 @@
From 1826349b5c9ab932a73f386e92645fab326e5f2b Mon Sep 17 00:00:00 2001
From 1929ca5d2796b16a152090ee693b0638134aa7cd Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index 54ecbdf..ff7b3d3 100644
index e5992f8..b80a760 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -64,11 +64,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
// CraftBukkit end
if (packethandshakinginsetprotocol.d() > 4) {
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.2");
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.5");
+ chatcomponenttext = new ChatComponentText( org.spigotmc.SpigotConfig.outdatedServerMessage ); // Spigot
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
this.b.a((IChatBaseComponent) chatcomponenttext);
this.b.close(chatcomponenttext);
} else if (packethandshakinginsetprotocol.d() < 4) {
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.2");
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.5");
+ chatcomponenttext = new ChatComponentText( org.spigotmc.SpigotConfig.outdatedClientMessage ); // Spigot
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
this.b.a((IChatBaseComponent) chatcomponenttext);
this.b.close(chatcomponenttext);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index b6a3d2b..9d116e5 100644
index 6454f8f..6fe8ca5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -335,7 +335,7 @@ public abstract class PlayerList {
@@ -45,10 +45,10 @@ index b6a3d2b..9d116e5 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a48fbe9..b9a72d8 100644
index 420e6e8..9a8d2c2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -688,11 +688,7 @@ public final class CraftServer implements Server {
@@ -691,11 +691,7 @@ public final class CraftServer implements Server {
return true;
}
@@ -103,5 +103,5 @@ index 8764045..0ab2ec3 100644
+ }
}
--
1.8.3.2
1.8.5.2.msysgit.0