CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.8.7

Browse Source
This commit is contained in:
Byteflux 2015-06-05 05:45:30 -07:00
parent a5bd933c3a
commit f6bd873c1d
9 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-API-Patches/0001-POM-changes.patch
View File

@ -1,11 +1,11 @@
From 943c6ec02e7d749b2815c280f673fbb17cd2ffbd Mon Sep 17 00:00:00 2001
From f7640e664a50266869f5ecf8a687540d82ea7966 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Tue, 6 Jan 2015 22:12:31 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index a8cde4f..a0d94d4 100644
index f0ceea5..0fcecd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,18 +4,18 @@
@ -24,7 +24,7 @@ index a8cde4f..a0d94d4 100644
- <artifactId>spigot-api</artifactId>
+ <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot-api</artifactId>
<version>1.8.6-R0.1-SNAPSHOT</version>
<version>1.8.7-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -35,5 +35,5 @@ index a8cde4f..a0d94d4 100644
<properties>
--
2.4.1.windows.1
1.9.5.msysgit.1

8
Spigot-API-Patches/0005-Add-getTPS-method.patch
View File

@ -1,14 +1,14 @@
From 8cc593837dbec7efb008515e7db936e19f488280 Mon Sep 17 00:00:00 2001
From a4c18f9cef6b6f29ef814ae4ac2583a8c079b21c Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Sun, 19 Oct 2014 18:22:18 -0500
Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index cf4ab1d..b7a02cc 100644
index 20edb77..5a0d32f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -934,6 +934,13 @@ public interface Server extends PluginMessageRecipient {
@@ -937,6 +937,13 @@ public interface Server extends PluginMessageRecipient {
public void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -23,5 +23,5 @@ index cf4ab1d..b7a02cc 100644
Spigot spigot();
--
1.9.1
1.9.5.msysgit.1

17
Spigot-Server-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From cd68e613ef1dab9ea6c0949808e692305bbd7b3d Mon Sep 17 00:00:00 2001
From 9f2870448d2ab27847088519c6b674d01076192c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 19 Mar 2015 19:41:15 -0500
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 99fe937..61d6346 100644
index 0e0fd09..bc0a4a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -17,7 +17,7 @@ index 99fe937..61d6346 100644
+ <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot</artifactId>
<packaging>jar</packaging>
<version>1.8.6-R0.1-SNAPSHOT</version>
<version>1.8.7-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>http://www.spigotmc.org</url>
+ <name>PaperSpigot</name>
@ -62,15 +62,6 @@ index 99fe937..61d6346 100644
</configuration>
<phase>initialize</phase>
<goals>
@@ -132,7 +132,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -142,7 +142,7 @@
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
@ -94,5 +85,5 @@ index 9304637..3a4b142 100644
if (stream != null) {
--
2.4.1.windows.1
1.9.5.msysgit.1

12
Spigot-Server-Patches/0002-PaperSpigot-config-files.patch
View File

@ -1,11 +1,11 @@
From 469624f4ab003a9eda57e265454a13dea46e7b02 Mon Sep 17 00:00:00 2001
From 185afbb2201ab2cc12ae0f8d15f8cdc173695fe2 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 May 2015 00:08:15 -0500
Subject: [PATCH] PaperSpigot config files
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 15d161d..8170343 100644
index 8303441..bc03bb3 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -177,6 +177,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -20,7 +20,7 @@ index 15d161d..8170343 100644
DedicatedServer.LOGGER.info("Generating keypair");
this.a(MinecraftEncryption.b());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6de5ba5..117d44c 100644
index ad0ee74..350bd0d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -161,6 +161,8 @@ public abstract class World implements IBlockAccess {
@ -41,10 +41,10 @@ index 6de5ba5..117d44c 100644
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 15aa1b7..4ddb088 100644
index fd41124..cc0626f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -693,6 +693,7 @@ public final class CraftServer implements Server {
@@ -689,6 +689,7 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -52,7 +52,7 @@ index 15aa1b7..4ddb088 100644
for (WorldServer world : console.worlds) {
world.worldData.setDifficulty(difficulty);
world.setSpawnFlags(monsters, animals);
@@ -708,12 +709,14 @@ public final class CraftServer implements Server {
@@ -704,12 +705,14 @@ public final class CraftServer implements Server {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
world.spigotConfig.init(); // Spigot

2
Spigot-Server-Patches/0018-Configurable-speed-for-water-flowing-over-lava.patch
View File

@ -1,4 +1,4 @@
From 87301edc13550f4968a6975fff8bdc99108d55a7 Mon Sep 17 00:00:00 2001
From c1be9631772d9b5561405e8453be6183d60ad231 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Sat, 7 Mar 2015 22:17:03 -0600
Subject: [PATCH] Configurable speed for water flowing over lava

12
Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
View File

@ -1,11 +1,11 @@
From 2a8b0ca92aee9d8899acdf6ea483e9d16e4da532 Mon Sep 17 00:00:00 2001
From 60cb36b88b86ace4deada026a6a4989535ee5706 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Mon, 18 May 2015 17:52:45 -0500
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 0fac7c9..9fd8b3c 100644
index 0fac7c9..8d2b3a1 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -61,6 +61,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -43,7 +43,7 @@ index 1680918..eca4679 100644
public void c() {
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 3964e3f..6c8e4df 100644
index 3964e3f..611b8fd 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -52,7 +52,7 @@ public final class SpawnerCreature {
@ -65,7 +65,7 @@ index 3964e3f..6c8e4df 100644
biomebase_biomemeta = worldserver.a(enumcreaturetype, blockposition2);
if (biomebase_biomemeta == null) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e1757c0..d30b406 100644
index 8bcb4ad..fae5eb7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2,35 +2,23 @@ package net.minecraft.server;
@ -112,7 +112,7 @@ index e1757c0..d30b406 100644
// CraftBukkit end
public abstract class World implements IBlockAccess {
@@ -2816,6 +2804,53 @@ public abstract class World implements IBlockAccess {
@@ -2814,6 +2802,53 @@ public abstract class World implements IBlockAccess {
return false;
}
@ -198,5 +198,5 @@ index 40ee4d3..130dcce 100644
public Player.Spigot spigot()
--
2.4.1.windows.1
1.9.5.msysgit.1

6
Spigot-Server-Patches/0024-Optimize-TileEntity-Ticking.patch
View File

@ -1,4 +1,4 @@
From 4104e547b01f6511a1c7a87a5eef7322e4a83878 Mon Sep 17 00:00:00 2001
From 8e823d14fadf4eb9eab85ff1da2da88811fa255c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 01:56:22 -0600
Subject: [PATCH] Optimize TileEntity Ticking
@ -74,7 +74,7 @@ index f75e2de..7119612 100644
if (this.e instanceof BlockDaylightDetector) {
((BlockDaylightDetector) this.e).f(this.world, this.position);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index bdf4896..67c739e 100644
index c93f575..e04603f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -53,7 +53,7 @@ public abstract class World implements IBlockAccess {
@ -262,5 +262,5 @@ index 0000000..5af5dcc
+}
\ No newline at end of file
--
2.4.1.windows.1
1.9.5.msysgit.1

10
Spigot-Server-Patches/0028-Further-improve-server-tick-loop.patch
View File

@ -1,4 +1,4 @@
From 7e9a0179b4ac80b064c4ad2641ba88f8426170df Mon Sep 17 00:00:00 2001
From b378f58c12647c892b0af373d813d8ac073e3f1a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 03:47:32 -0500
Subject: [PATCH] Further improve server tick loop
@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1f3fea7..9f4372c 100644
index 87e8ff2..8a71423 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -115,17 +115,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -150,10 +150,10 @@ index 1f3fea7..9f4372c 100644
lastTick = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4ddb088..421fa76 100644
index cc0626f..46bc341 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1704,6 +1704,17 @@ public final class CraftServer implements Server {
@@ -1700,6 +1700,17 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{
@ -212,5 +212,5 @@ index be2e31d..21fd7ef 100644
return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
+ ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
--
2.4.1.windows.1
1.9.5.msysgit.1

8
Spigot-Server-Patches/0042-Configurable-async-light-updates.patch
View File

@ -1,11 +1,11 @@
From 5b687e8dda6c3791536ae533422d02ac55ea960f Mon Sep 17 00:00:00 2001
From 95ec45d55c70af957d01dcea841bdf8d9ef02b35 Mon Sep 17 00:00:00 2001
From: Roman Alexander <romanalexander@users.noreply.github.com>
Date: Wed, 25 Mar 2015 20:27:13 -0500
Subject: [PATCH] Configurable async light updates
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 51e59c0..86913f4 100644
index b681a9f..f507134 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,6 +18,12 @@ import org.bukkit.generator.ChunkGenerator;
@ -54,7 +54,7 @@ index 51e59c0..86913f4 100644
chunk.a(enumskyblock, blockposition, i);
this.n(blockposition);
}
@@ -2318,10 +2328,13 @@ public abstract class World implements IBlockAccess {
@@ -2316,10 +2326,13 @@ public abstract class World implements IBlockAccess {
}
private int a(BlockPosition blockposition, EnumSkyBlock enumskyblock) {
@ -70,7 +70,7 @@ index 51e59c0..86913f4 100644
int i = enumskyblock == EnumSkyBlock.SKY ? 0 : block.r();
int j = block.p();
@@ -2360,131 +2373,154 @@ public abstract class World implements IBlockAccess {
@@ -2358,131 +2371,154 @@ public abstract class World implements IBlockAccess {
}
}