mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update to 1.8.5

Browse source
This commit is contained in:
Thinkofdeath 2015-05-22 14:52:56 +01:00 committed by Zach Brown
parent 51360537c1
commit e6c909c623
11 changed files with 80 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0001-POM-Changes.patch
View file

@ -1,11 +1,11 @@
From 8d954ca68fa1829aab7497155ad91a55f4f6a312 Mon Sep 17 00:00:00 2001
From f1cb30a12af3222fecbc28cad6d8df59ff4963b6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index a674b3f..f38a019 100644
index a26d96b..7775718 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
@ -16,7 +16,7 @@ index a674b3f..f38a019 100644
- <artifactId>bukkit</artifactId>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.8.4-R0.1-SNAPSHOT</version>
<version>1.8.5-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Bukkit</name>

10
Bukkit-Patches/0002-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 122641c7243101d60135c7a3b1bb4de2f6951669 Mon Sep 17 00:00:00 2001
From 1a62f1feadb23a51bba04813d45ba8fedfed242a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Spigot Timings
@ -276,7 +276,7 @@ index d2fe422..1d51908 100644
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 687029f..b081ecb 100644
index 2118771..cd843f4 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -39,6 +39,7 @@ import org.bukkit.plugin.PluginLoader;
@ -295,7 +295,7 @@ index 687029f..b081ecb 100644
/**
* This class was not meant to be constructed explicitly
@@ -286,13 +288,19 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -291,13 +293,19 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
@ -315,7 +315,7 @@ index 687029f..b081ecb 100644
} catch (InvocationTargetException ex) {
throw new EventException(ex.getCause());
} catch (Throwable t) {
@@ -300,7 +308,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -305,7 +313,7 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
};
@ -496,5 +496,5 @@ index 0000000..8d98297
+ }
+}
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0001-POM-Changes.patch
View file

@ -1,4 +1,4 @@
From a326d05aad5efc05a9fabeefbeae21b4a132ed36 Mon Sep 17 00:00:00 2001
From 846140a136ee89b1bb54cff2c02d5dc2d5124c4a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
diff --git a/pom.xml b/pom.xml
index c5503f6..333f528 100644
index 4cecb88..f15cc07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -18,7 +18,7 @@ index c5503f6..333f528 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.8.4-R0.1-SNAPSHOT</version>
<version>1.8.5-R0.1-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>

14
CraftBukkit-Patches/0029-Configurable-Messages.patch
View file

@ -1,29 +1,29 @@
From 27d753cee3b24229e5624bf976d48fa7db2e9bfa Mon Sep 17 00:00:00 2001
From 74183abb45c43c42a5f20e55bcf58e2e57f45304 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 ef70306..b34a59a 100644
index 7c4d3cc..ca92289 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
// CraftBukkit end
if (packethandshakinginsetprotocol.b() > 47) {
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.4");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.4" ) ); // Spigot
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.5");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.5" ) ); // Spigot
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext));
this.b.close(chatcomponenttext);
} else if (packethandshakinginsetprotocol.b() < 47) {
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.4");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.4" ) ); // Spigot
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.5");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.5" ) ); // Spigot
this.b.handle(new PacketLoginOutDisconnect(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 cb84736..0278cfd 100644
index 7918bcb..825823d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -418,7 +418,7 @@ public abstract class PlayerList {

58
CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch
View file

@ -1,14 +1,14 @@
From 1f4be3eb66fa4ad635fd29c339d43115d3369577 Mon Sep 17 00:00:00 2001
From dd6954ab95714be55cfec586216f0561e4905d3a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 6 Oct 2013 17:36:28 +1100
Subject: [PATCH] Don't Special Case X Move Value
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 7236d36..f965946 100644
index 3904a80..f86f09a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -109,6 +109,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -111,6 +111,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
private float lastPitch = Float.MAX_VALUE;
private float lastYaw = Float.MAX_VALUE;
private boolean justTeleported = false;
@ -16,34 +16,34 @@ index 7236d36..f965946 100644
public CraftPlayer getPlayer() {
return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
@@ -223,6 +224,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
}
// CraftBukkit start - fire PlayerMoveEvent
Player player = this.getPlayer();
+ // Spigot Start
+ if ( !hasMoved )
+ {
+ Location curPos = player.getLocation();
+ lastPosX = curPos.getX();
+ lastPosY = curPos.getY();
+ lastPosZ = curPos.getZ();
+ lastYaw = curPos.getYaw();
+ lastPitch = curPos.getPitch();
+ hasMoved = true;
+ }
+ // Spigot End
Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
@@ -222,6 +223,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
}
// CraftBukkit start - fire PlayerMoveEvent
Player player = this.getPlayer();
+ // Spigot Start
+ if ( !hasMoved )
+ {
+ Location curPos = player.getLocation();
+ lastPosX = curPos.getX();
+ lastPosY = curPos.getY();
+ lastPosZ = curPos.getZ();
+ lastYaw = curPos.getYaw();
+ lastPitch = curPos.getPitch();
+ hasMoved = true;
+ }
+ // Spigot End
Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
@@ -251,7 +264,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
this.lastPitch = to.getPitch();
@@ -250,7 +263,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
this.lastPitch = to.getPitch();
// Skip the first time we do this
- if (from.getX() != Double.MAX_VALUE) {
+ if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
this.server.getPluginManager().callEvent(event);
// Skip the first time we do this
- if (from.getX() != Double.MAX_VALUE) {
+ if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
this.server.getPluginManager().callEvent(event);
--
2.1.4

6
CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch
View file

@ -1,11 +1,11 @@
From 5d270b294d73bf43e7394b140068a3d58958224d Mon Sep 17 00:00:00 2001
From e535e5c1bba5c213865a477e6672281b764971e9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 25 Jan 2014 14:08:35 +1100
Subject: [PATCH] Highly Optimized Tick Loop
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d34c4e9..04874dd 100644
index 892d907..e3d4a07 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -120,6 +120,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -36,7 +36,7 @@ index d34c4e9..04874dd 100644
try {
if (this.init()) {
@@ -513,38 +526,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.r.setServerInfo(new ServerPing.ServerData("1.8.4", 47));
this.r.setServerInfo(new ServerPing.ServerData("1.8.5", 47));
this.a(this.r);
+ // Spigot start

6
CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch
View file

@ -1,14 +1,14 @@
From e69291f969d4c2b4396bd3f1bdf8b7d4a6a05758 Mon Sep 17 00:00:00 2001
From 8e32d66728845bb6608ad877fe9c7237590694c8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 18:18:01 +1100
Subject: [PATCH] Allow Disabling Creative Item Filter
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index dc395e1..bba531c 100644
index b92a51b..854fcf0 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1697,7 +1697,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -1709,7 +1709,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize();
// CraftBukkit - Add invalidItems check

6
CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch
View file

@ -1,4 +1,4 @@
From e904ef2211f681fcd0a2f4453b1e41080ce11dae Mon Sep 17 00:00:00 2001
From 457868a34c767ff1cc08a7f490f6371ffcfb3ce7 Mon Sep 17 00:00:00 2001
From: hcherndon <hcherndon@gmail.com>
Date: Sat, 15 Feb 2014 01:51:20 -0600
Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index bba531c..23a03ce 100644
index 854fcf0..a57fa47 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2060,7 +2060,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -2071,7 +2071,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
}
// CraftBukkit start - Add "isDisconnected" method

13
CraftBukkit-Patches/0094-Descriptive-kick-reasons-instead-of-Nope.patch
View file

@ -1,4 +1,4 @@
From 598d9e52bcc654a4ef0482b8ecd382e9e27fbf00 Mon Sep 17 00:00:00 2001
From 00c8c5f870142ae3efac8c35e83b14e46bf10072 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 15 Mar 2014 01:30:05 -0400
Subject: [PATCH] Descriptive kick reasons instead of Nope!
@ -27,18 +27,9 @@ index 82accf4..d6bef0b 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 23a03ce..ddd03f5 100644
index a57fa47..fc280da 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -200,7 +200,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|| !NumberConversions.isFinite(packetplayinflying.yaw)
|| !NumberConversions.isFinite(packetplayinflying.pitch)) {
c.warn(player.getName() + " was caught trying to crash the server with an invalid position.");
- getPlayer().kickPlayer("Nope!");
+ getPlayer().kickPlayer("NaN in position (Hacking?)"); //Spigot "Nope" -> Descriptive reason
return;
}
// CraftBukkit end
@@ -894,7 +894,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
this.player.resetIdleTimer();
} else {

22
CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch
View file

@ -1,23 +1,23 @@
From 82d4bdfcb439e9d298c870b946d1080d5bc66619 Mon Sep 17 00:00:00 2001
From 9fc09c3b5b09ce4f86af0dbf88cf291e49a04e83 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Fri, 4 Jul 2014 23:03:13 +0200
Subject: [PATCH] Make "moved wrongly" limit configurable
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 88e0306..f37e7c8 100644
index 9c1da26..b0e34c1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -418,7 +418,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
d15 = d11 * d11 + d12 * d12 + d13 * d13;
boolean flag1 = false;
@@ -417,7 +417,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
d15 = d11 * d11 + d12 * d12 + d13 * d13;
boolean flag1 = false;
- if (d15 > 0.0625D && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative()) {
+ // Spigot: make "moved wrongly" limit configurable
+ if (d15 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative()) {
flag1 = true;
PlayerConnection.c.warn(this.player.getName() + " moved wrongly!");
}
- if (d15 > 0.0625D && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative()) {
+ // Spigot: make "moved wrongly" limit configurable
+ if (d15 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative()) {
flag1 = true;
PlayerConnection.c.warn(this.player.getName() + " moved wrongly!");
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index c5e995b..759a95a 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java

22
CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch
View file

@ -1,23 +1,23 @@
From 892d04db594a0c58f339a308f906e238772af1c8 Mon Sep 17 00:00:00 2001
From 8130f62a18f9d0948bff75ac8d3234d4b78abc4e Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Tue, 22 Jul 2014 15:59:01 +0200
Subject: [PATCH] Make "moved too quickly" limit configurable
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f37e7c8..932d9a6 100644
index b0e34c1..9580cd4 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -391,7 +391,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
double d14 = this.player.motX * this.player.motX + this.player.motY * this.player.motY + this.player.motZ * this.player.motZ;
double d15 = d11 * d11 + d12 * d12 + d13 * d13;
@@ -390,7 +390,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
double d14 = this.player.motX * this.player.motX + this.player.motY * this.player.motY + this.player.motZ * this.player.motZ;
double d15 = d11 * d11 + d12 * d12 + d13 * d13;
- if (d15 - d14 > 100.0D && this.checkMovement && (!this.minecraftServer.T() || !this.minecraftServer.S().equals(this.player.getName()))) { // CraftBukkit - Added this.checkMovement condition to solve this check being triggered by teleports
+ // Spigot: make "moved too quickly" limit configurable
+ if (d15 - d14 > org.spigotmc.SpigotConfig.movedTooQuicklyThreshold && this.checkMovement && (!this.minecraftServer.T() || !this.minecraftServer.S().equals(this.player.getName()))) { // CraftBukkit - Added this.checkMovement condition to solve this check being triggered by teleports
PlayerConnection.c.warn(this.player.getName() + " moved too quickly! " + d11 + "," + d12 + "," + d13 + " (" + d11 + ", " + d12 + ", " + d13 + ")");
this.a(this.o, this.p, this.q, this.player.yaw, this.player.pitch);
return;
- if (d15 - d14 > 100.0D && this.checkMovement && (!this.minecraftServer.T() || !this.minecraftServer.S().equals(this.player.getName()))) { // CraftBukkit - Added this.checkMovement condition to solve this check being triggered by teleports
+ // Spigot: make "moved too quickly" limit configurable
+ if (d15 - d14 > org.spigotmc.SpigotConfig.movedTooQuicklyThreshold && this.checkMovement && (!this.minecraftServer.T() || !this.minecraftServer.S().equals(this.player.getName()))) { // CraftBukkit - Added this.checkMovement condition to solve this check being triggered by teleports
PlayerConnection.c.warn(this.player.getName() + " moved too quickly! " + d11 + "," + d12 + "," + d13 + " (" + d11 + ", " + d12 + ", " + d13 + ")");
this.a(this.o, this.p, this.q, this.player.yaw, this.player.pitch);
return;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 759a95a..8233de7 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java