core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.12.1

This commit is contained in:
BlackHole 2017-08-03 16:36:06 +02:00
parent 2e157dd1b4
commit 6879328bf6
69 changed files with 414 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 69671c3d50b5ad75e2c8f11130e76efc5c676fbb Mon Sep 17 00:00:00 2001
From ed103e824a3c48330567e5b1a0a7bc112e94c4da Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 0c3bf997..cce94262 100644
index 8c6d1aa1..07143b46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,36 @@
@@ -4,44 +4,38 @@
<modelVersion>4.0.0</modelVersion>
<parent>
@ -24,7 +24,7 @@ index 0c3bf997..cce94262 100644
- <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.12-R0.1-SNAPSHOT</version>
<version>1.12.1-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -42,7 +42,6 @@ index 0c3bf997..cce94262 100644
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<!-- just until we get deployment to central approved -->
<distributionManagement>
<repository>
- <id>spigotmc-releases</id>
@ -58,12 +57,26 @@ index 0c3bf997..cce94262 100644
</snapshotRepository>
</distributionManagement>
@@ -44,6 +45,13 @@
- <repositories>
- <repository>
- <id>spigotmc-public</id>
- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
- </repository>
- </repositories>
-
<pluginRepositories>
<pluginRepository>
<id>spigotmc-public</id>
@@ -49,6 +43,17 @@
</pluginRepository>
</pluginRepositories>
+ <repositories>
+ <repository>
+ <id>spigotmc-public</id>
+ <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository>
@ -72,7 +85,7 @@ index 0c3bf997..cce94262 100644
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -58,6 +66,13 @@
@@ -63,6 +68,13 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
@ -86,7 +99,7 @@ index 0c3bf997..cce94262 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -102,6 +117,7 @@
@@ -107,6 +119,7 @@
</dependencies>
<build>
@ -94,7 +107,7 @@ index 0c3bf997..cce94262 100644
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -121,26 +137,6 @@
@@ -126,26 +139,6 @@
</dependencies>
</plugin>
<plugin>
@ -121,7 +134,7 @@ index 0c3bf997..cce94262 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
@@ -153,8 +149,7 @@
@@ -158,8 +151,7 @@
</execution>
</executions>
<configuration>
@ -132,5 +145,5 @@ index 0c3bf997..cce94262 100644
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
--
2.13.0
2.13.3.windows.1

8
Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
View File

@ -1,14 +1,14 @@
From 1ea2f5f4ceef51d35a4266ed0b3eb471fde1bff8 Mon Sep 17 00:00:00 2001
From 5043bec2a991e4d8c55b934538518a5c112772f1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 1 Apr 2016 00:02:47 -0400
Subject: [PATCH] add Trove and FastUtil to Bukkit
diff --git a/pom.xml b/pom.xml
index 968f9091..04168f66 100644
index 07143b46..1e57d386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,19 @@
@@ -56,6 +56,19 @@
<dependencies>
<dependency>
@ -29,5 +29,5 @@ index 968f9091..04168f66 100644
<artifactId>commons-lang</artifactId>
<version>2.6</version>
--
2.13.0.windows.1
2.13.3.windows.1

8
Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
View File

@ -1,14 +1,14 @@
From 5ef20af4d2a072437de748eaa6e247164cc4254e Mon Sep 17 00:00:00 2001
From 983f39e99a72d696cce6d90cd3688cbffbf5bf22 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:47:27 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index fc41a43d..d6597ca7 100644
index 5a30fa93..be51e389 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -389,4 +389,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
@@ -360,4 +360,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @return collision status
*/
boolean isCollidable();
@ -29,5 +29,5 @@ index fc41a43d..d6597ca7 100644
+ // Paper end
}
--
2.13.0
2.13.3.windows.1

8
Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
View File

@ -1,4 +1,4 @@
From 2ba17bea4632f1947234d462d0e7bc597450f0fe Mon Sep 17 00:00:00 2001
From 10a16475692e849a7707ad9d542df68bd9ace602 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 13:20:33 -0700
Subject: [PATCH] Use ASM for event executors.
@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods.
diff --git a/pom.xml b/pom.xml
index 04168f66..862910e0 100644
index 1e57d386..de5bc3f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,6 +127,12 @@
@@ -129,6 +129,12 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
@ -395,5 +395,5 @@ index d8b9c244..40fd71dc 100644
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else {
--
2.13.0.windows.1
2.13.3.windows.1

8
Spigot-API-Patches/0058-Profile-Lookup-Events.patch
View File

@ -1,4 +1,4 @@
From 5385d2681d3cad437db365cbfa18673430f323e2 Mon Sep 17 00:00:00 2001
From cb77703817c58fc10b14faf4fbfaeee5a9f98e7b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 16:30:44 -0400
Subject: [PATCH] Profile Lookup Events
@ -7,10 +7,10 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
profiles that had to be looked up.
diff --git a/pom.xml b/pom.xml
index 09fb3408..4ff0c6f2 100644
index de5bc3f3..293442c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,13 @@
@@ -62,6 +62,13 @@
<!-- Trove Provided by CraftBukkit -->
<scope>provided</scope>
</dependency>
@ -235,5 +235,5 @@ index 00000000..750b9334
+ }
+}
--
2.13.3
2.13.3.windows.1

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

@ -1,11 +1,11 @@
From b14b02e17ed398f786427ff1c794ea9a24611d5a Mon Sep 17 00:00:00 2001
From 44f2671b31ac71bd6408dcc230cafa239470f434 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:40:33 -0600
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index dafedf609..4cac7e38e 100644
index 9072ab9f4..bb305c7c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -17,7 +17,7 @@ index dafedf609..4cac7e38e 100644
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper</artifactId>
<packaging>jar</packaging>
<version>1.12-R0.1-SNAPSHOT</version>
<version>1.12.1-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>http://www.spigotmc.org</url>
+ <name>Paper</name>
@ -47,7 +47,7 @@ index dafedf609..4cac7e38e 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -102,34 +102,22 @@
@@ -108,34 +108,22 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
@ -93,7 +93,7 @@ index dafedf609..4cac7e38e 100644
</goals>
</execution>
</executions>
@@ -139,11 +127,12 @@
@@ -145,11 +133,12 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
@ -107,7 +107,7 @@ index dafedf609..4cac7e38e 100644
<Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
@@ -203,19 +192,22 @@
@@ -209,19 +198,22 @@
<goal>shade</goal>
</goals>
<configuration>
@ -138,7 +138,7 @@ index dafedf609..4cac7e38e 100644
<relocation>
<pattern>org.bukkit.craftbukkit</pattern>
<shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
@@ -241,18 +233,6 @@
@@ -247,18 +239,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
@ -171,5 +171,5 @@ index 93046379d..674096cab 100644
if (stream != null) {
--
2.13.0
2.13.3.windows.1

14
Spigot-Server-Patches/0002-Paper-config-files.patch
View File

@ -1,4 +1,4 @@
From 23030933bd7a18768c7dca7736c225ac268c5e49 Mon Sep 17 00:00:00 2001
From 74540d1d2671859627d8738cc1b28247a90c08cd Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 21:02:09 -0600
Subject: [PATCH] Paper config files
@ -337,7 +337,7 @@ index 000000000..621bf7051
+ }
+}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 2e72afae2..5e6a7b9e4 100644
index 46b264227..6f63a5a1d 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -184,6 +184,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -352,10 +352,10 @@ index 2e72afae2..5e6a7b9e4 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 ecd67652d..5fe013e6b 100644
index e1833f376..1096c6c66 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -128,6 +128,8 @@ public abstract class World implements IBlockAccess {
@@ -129,6 +129,8 @@ public abstract class World implements IBlockAccess {
private int tickPosition;
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
@ -364,7 +364,7 @@ index ecd67652d..5fe013e6b 100644
public final SpigotTimings.WorldTimingsHandler timings; // Spigot
private boolean guardEntityList; // Spigot
public static boolean haveWeSilencedAPhysicsCrash;
@@ -150,6 +152,7 @@ public abstract class World implements IBlockAccess {
@@ -151,6 +153,7 @@ public abstract class World implements IBlockAccess {
protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
@ -428,7 +428,7 @@ index e0fa25bb2..3354bf65f 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index a151451d5..0c5862a3f 100644
index a1b240daf..96585fb24 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -126,6 +126,14 @@ public class Main {
@ -488,5 +488,5 @@ index 01e73eb89..0b66f5e35 100644
config.addDefault( "world-settings.default." + path, def );
return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
--
2.13.3
2.13.3.windows.1

74
Spigot-Server-Patches/0006-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From c78705e3ca96baa6fc5ab49a41410c834b571238 Mon Sep 17 00:00:00 2001
From 591e8bd51a21e7051fe5f4daad108fc54f63f840 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@ -424,7 +424,7 @@ index 5ab2cf6ee..b5795b6d3 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index ddc7a2931..785106dd8 100644
index 2dca6dbcb..352310960 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -35,6 +35,15 @@ public class Block {
@ -514,7 +514,7 @@ index 9dcab42de..c1b0d6cea 100644
this.chunkLoader.a(this.world, chunk);
} catch (IOException ioexception) {
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index a4fca0ca9..161ea8172 100644
index 370f1418b..f4161b8ec 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -388,7 +388,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -554,7 +554,7 @@ index a4fca0ca9..161ea8172 100644
// return chunk; // CraftBukkit
}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 5e6a7b9e4..bfc0b0433 100644
index 6f63a5a1d..3b8425915 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -24,7 +24,7 @@ import java.io.PrintStream;
@ -566,7 +566,7 @@ index 5e6a7b9e4..bfc0b0433 100644
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
@@ -433,7 +433,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -434,7 +434,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public void aP() {
@ -575,7 +575,7 @@ index 5e6a7b9e4..bfc0b0433 100644
while (!this.serverCommandQueue.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
@@ -448,7 +448,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -449,7 +449,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
// CraftBukkit end
}
@ -584,7 +584,7 @@ index 5e6a7b9e4..bfc0b0433 100644
}
public boolean aa() {
@@ -694,7 +694,20 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -695,7 +695,20 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return remoteControlCommandListener.getMessages();
}
};
@ -607,7 +607,7 @@ index 5e6a7b9e4..bfc0b0433 100644
return waitable.get();
} catch (java.util.concurrent.ExecutionException e) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 38fb9104f..66e707b71 100644
index 6258cfd01..2b508a029 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
@ -748,10 +748,10 @@ index 284d1204d..3aab54206 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e396b3822..43b4e552b 100644
index da9ad6037..5b5c143b0 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -47,8 +47,8 @@ import org.bukkit.Bukkit;
@@ -48,8 +48,8 @@ import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.Main;
// CraftBukkit end
@ -761,7 +761,7 @@ index e396b3822..43b4e552b 100644
public abstract class MinecraftServer implements ICommandListener, Runnable, IAsyncTaskHandler, IMojangStatistics {
@@ -459,6 +459,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -460,6 +460,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
// CraftBukkit end
MinecraftServer.LOGGER.info("Stopping server");
@ -769,7 +769,7 @@ index e396b3822..43b4e552b 100644
// CraftBukkit start
if (this.server != null) {
this.server.disablePlugins();
@@ -663,7 +664,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -664,7 +665,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
public void B() {}
protected void C() throws ExceptionWorldConflict { // CraftBukkit - added throws
@ -778,7 +778,7 @@ index e396b3822..43b4e552b 100644
this.slackActivityAccountant.tickStarted(); // Spigot
long i = System.nanoTime();
@@ -691,7 +692,6 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -692,7 +693,6 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@ -786,7 +786,7 @@ index e396b3822..43b4e552b 100644
this.methodProfiler.a("save");
this.v.savePlayers();
// Spigot Start
@@ -706,7 +706,6 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -707,7 +707,6 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
// this.saveChunks(true);
// Spigot End
this.methodProfiler.b();
@ -794,7 +794,7 @@ index e396b3822..43b4e552b 100644
}
this.methodProfiler.a("tallying");
@@ -729,14 +728,14 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -730,14 +729,14 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
org.spigotmc.WatchdogThread.tick(); // Spigot
this.slackActivityAccountant.tickEnded(tickNanos); // Spigot
@ -813,7 +813,7 @@ index e396b3822..43b4e552b 100644
this.methodProfiler.a("jobs");
Queue queue = this.j;
@@ -747,22 +746,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -748,22 +747,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
SystemUtils.a(entry, MinecraftServer.LOGGER);
}
// Spigot end
@ -842,7 +842,7 @@ index e396b3822..43b4e552b 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
@@ -770,7 +770,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -771,7 +771,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
}
}
@ -851,7 +851,7 @@ index e396b3822..43b4e552b 100644
int i;
@@ -827,9 +827,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -830,9 +830,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@ -861,7 +861,7 @@ index e396b3822..43b4e552b 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -838,24 +836,24 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -841,24 +839,24 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
this.methodProfiler.c("connection");
@ -995,7 +995,7 @@ index eeac34998..e4ed2e991 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 70ddf9250..f7326aeec 100644
index b679b1363..03bbac737 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -1006,7 +1006,7 @@ index 70ddf9250..f7326aeec 100644
// CraftBukkit end
public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1366,7 +1367,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1367,7 +1368,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit end
private void handleCommand(String s) {
@ -1015,7 +1015,7 @@ index 70ddf9250..f7326aeec 100644
// CraftBukkit start - whole method
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
@@ -1377,22 +1378,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1378,22 +1379,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -1073,7 +1073,7 @@ index f74b06794..1fc632e0c 100644
+ // Paper end
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 65b075307..b9920a5fc 100644
index c00aee885..b3356b40f 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
@ -1139,7 +1139,7 @@ index 74e3f42cd..2580a4cf6 100644
return flag;
}
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 591f4ad7f..e02f0c442 100644
index 5a5a588e7..d2d4ff6fb 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@ -1159,10 +1159,10 @@ index 591f4ad7f..e02f0c442 100644
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5fe013e6b..ce2817d56 100644
index 1096c6c66..f06b82ec5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@@ -19,11 +19,11 @@ import com.google.common.collect.Maps;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.block.BlockState;
@ -1175,7 +1175,7 @@ index 5fe013e6b..ce2817d56 100644
import org.bukkit.event.block.BlockCanBuildEvent;
import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -130,7 +130,7 @@ public abstract class World implements IBlockAccess {
@@ -131,7 +131,7 @@ public abstract class World implements IBlockAccess {
public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
@ -1184,7 +1184,7 @@ index 5fe013e6b..ce2817d56 100644
private boolean guardEntityList; // Spigot
public static boolean haveWeSilencedAPhysicsCrash;
public static String blockLocation;
@@ -200,7 +200,7 @@ public abstract class World implements IBlockAccess {
@@ -201,7 +201,7 @@ public abstract class World implements IBlockAccess {
});
this.getServer().addWorld(this.world);
// CraftBukkit end
@ -1193,7 +1193,7 @@ index 5fe013e6b..ce2817d56 100644
this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
}
@@ -1385,6 +1385,7 @@ public abstract class World implements IBlockAccess {
@@ -1386,6 +1386,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.c("remove");
@ -1201,7 +1201,7 @@ index 5fe013e6b..ce2817d56 100644
this.entityList.removeAll(this.f);
int j;
@@ -1405,6 +1406,7 @@ public abstract class World implements IBlockAccess {
@@ -1406,6 +1407,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.l();
@ -1209,7 +1209,7 @@ index 5fe013e6b..ce2817d56 100644
this.methodProfiler.c("regular");
CrashReportSystemDetails crashreportsystemdetails1;
@@ -1414,6 +1416,7 @@ public abstract class World implements IBlockAccess {
@@ -1415,6 +1417,7 @@ public abstract class World implements IBlockAccess {
timings.entityTick.startTiming(); // Spigot
guardEntityList = true; // Spigot
// CraftBukkit start - Use field for loop variable
@ -1217,7 +1217,7 @@ index 5fe013e6b..ce2817d56 100644
int entitiesThisCycle = 0;
if (tickPosition < 0) tickPosition = 0;
for (entityLimiter.initTick();
@@ -1435,10 +1438,11 @@ public abstract class World implements IBlockAccess {
@@ -1436,10 +1439,11 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick");
if (!entity.dead && !(entity instanceof EntityPlayer)) {
try {
@ -1231,7 +1231,7 @@ index 5fe013e6b..ce2817d56 100644
crashreport1 = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
entity.appendEntityCrashDetails(crashreportsystemdetails1);
@@ -1571,6 +1575,7 @@ public abstract class World implements IBlockAccess {
@@ -1574,6 +1578,7 @@ public abstract class World implements IBlockAccess {
}
timings.tileEntityPending.stopTiming(); // Spigot
@ -1239,7 +1239,7 @@ index 5fe013e6b..ce2817d56 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1629,7 +1634,6 @@ public abstract class World implements IBlockAccess {
@@ -1632,7 +1637,6 @@ public abstract class World implements IBlockAccess {
}
// CraftBukkit end
@ -1247,7 +1247,7 @@ index 5fe013e6b..ce2817d56 100644
entity.M = entity.locX;
entity.N = entity.locY;
entity.O = entity.locZ;
@@ -1637,6 +1641,7 @@ public abstract class World implements IBlockAccess {
@@ -1640,6 +1644,7 @@ public abstract class World implements IBlockAccess {
entity.lastPitch = entity.pitch;
if (flag && entity.aa) {
++entity.ticksLived;
@ -1255,7 +1255,7 @@ index 5fe013e6b..ce2817d56 100644
if (entity.isPassenger()) {
entity.aE();
} else {
@@ -1696,8 +1701,6 @@ public abstract class World implements IBlockAccess {
@@ -1699,8 +1704,6 @@ public abstract class World implements IBlockAccess {
}
}
}
@ -1918,5 +1918,5 @@ index 2bd690fdf..38be7ed71 100644
}
}
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
View File

@ -1,4 +1,4 @@
From c1bf7c5cd01c139578159ce81394952191586a71 Mon Sep 17 00:00:00 2001
From 95f35af2f0cbcd086e82db7f001ed34265d28217 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 3 Mar 2016 03:53:43 -0600
Subject: [PATCH] Allow for toggling of spawn chunks
@ -20,10 +20,10 @@ index 4b64ccaa0..7ac6a5f1f 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ce2817d56..4f6c4fb7b 100644
index f06b82ec5..5c44e0ed4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -201,6 +201,7 @@ public abstract class World implements IBlockAccess {
@@ -202,6 +202,7 @@ public abstract class World implements IBlockAccess {
this.getServer().addWorld(this.world);
// CraftBukkit end
timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
@ -32,5 +32,5 @@ index ce2817d56..4f6c4fb7b 100644
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
}
--
2.13.3
2.13.3.windows.1

10
Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
View File

@ -1,4 +1,4 @@
From 4fbd5c4b6bb219d75c8b5b2e87771cfab5d5c59a Mon Sep 17 00:00:00 2001
From a0c490de7c95d2fd8dd5f77bfae08e9a69e3cd60 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 14:32:43 -0600
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@ -20,10 +20,10 @@ index 8361888c2..3623751bf 100644
EULA.a.warn("Failed to save {}", this.b, exception);
} finally {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 43b4e552b..024218a1d 100644
index 5b5c143b0..42abdfe12 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1046,7 +1046,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -1049,7 +1049,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
public String getServerModName() {
@ -46,7 +46,7 @@ index 8c9e26eb9..f17e36e7e 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 0c5862a3f..e3667e558 100644
index 96585fb24..f95da9e26 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -192,7 +192,7 @@ public class Main {
@ -93,5 +93,5 @@ index 94a3d4237..3ed983cc0 100644
log.log( Level.SEVERE, "------------------------------" );
//
--
2.13.3
2.13.3.windows.1

10
Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
View File

@ -1,11 +1,11 @@
From 0cd969d1027bf2228f03779bc726a8710169ccc6 Mon Sep 17 00:00:00 2001
From 243a1e2e39b916cb8156a94c1765f68bf4c14eb6 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
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 b8479d9cf..e9509e618 100644
index 50829d843..5080290cd 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -57,10 +57,10 @@ index a599a043d..1c7c187c7 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4f6c4fb7b..769e381fe 100644
index 5c44e0ed4..27f428efa 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2736,7 +2736,7 @@ public abstract class World implements IBlockAccess {
@@ -2739,7 +2739,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
@ -91,5 +91,5 @@ index d38900887..939233ef7 100644
// Spigot start
--
2.13.3
2.13.3.windows.1

12
Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
View File

@ -1,4 +1,4 @@
From 179493c3ee21a683630fa32e0ecc9d43c2664ae5 Mon Sep 17 00:00:00 2001
From 63751d970ad43e4cf66e5959c4001330da8fa78e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 1 Mar 2016 23:09:29 -0600
Subject: [PATCH] Further improve server tick loop
@ -12,10 +12,10 @@ 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 024218a1d..9d2f3b834 100644
index 42abdfe12..f4d0e2678 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -113,16 +113,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -114,16 +114,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
public org.bukkit.command.ConsoleCommandSender console;
public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
public ConsoleReader reader;
@ -33,7 +33,7 @@ index 024218a1d..9d2f3b834 100644
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -533,12 +529,54 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -534,12 +530,54 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.isRunning = false;
}
@ -93,7 +93,7 @@ index 024218a1d..9d2f3b834 100644
public void run() {
try {
@@ -552,24 +590,41 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -553,24 +591,41 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
// Spigot start
Arrays.fill( recentTps, 20 );
@ -210,5 +210,5 @@ index be2e31dea..6d21c3269 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.13.3
2.13.3.windows.1

14
Spigot-Server-Patches/0023-Entity-Origin-API.patch
View File

@ -1,11 +1,11 @@
From 51975ee1cc2b9540929b648cf46169452d020bd2 Mon Sep 17 00:00:00 2001
From 0a357cb9c574fa7812c4b90a4b59cc2c8082bdcd Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d1c40b298..a6a5f73f5 100644
index 86c946119..acadeae93 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -148,6 +148,7 @@ public abstract class Entity implements ICommandListener {
@ -51,7 +51,7 @@ index d1c40b298..a6a5f73f5 100644
NBTTagList nbttaglist = new NBTTagList();
double[] adouble1 = adouble;
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index 16a6f3b9c..f4bb2e651 100644
index 2ba5d51a5..abdc2dea9 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -267,6 +267,14 @@ public class EntityFallingBlock extends Entity {
@ -101,10 +101,10 @@ index bc6383669..ca9eb2f3b 100644
if (i >= 0 && i < this.list.size()) {
NBTBase nbtbase = (NBTBase) this.list.get(i);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 769e381fe..71882a169 100644
index 27f428efa..3298cbe6b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1024,6 +1024,12 @@ public abstract class World implements IBlockAccess {
@@ -1025,6 +1025,12 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ / 16.0D);
boolean flag = entity.attachedToPlayer;
@ -118,7 +118,7 @@ index 769e381fe..71882a169 100644
flag = true;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index dc6a6b37b..d12278a52 100644
index 30641581a..9ee7593b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -749,4 +749,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -135,5 +135,5 @@ index dc6a6b37b..d12278a52 100644
+ // Paper end
}
--
2.13.3
2.13.3.windows.1

12
Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
View File

@ -1,11 +1,11 @@
From 6bc4e40f63d1e5ba09ffbecfe918b14afcd84932 Mon Sep 17 00:00:00 2001
From cec6fa899d937784ae350110089c2bd61a4edf37 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 1 Mar 2016 23:52:34 -0600
Subject: [PATCH] Prevent tile entity and entity crashes
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index e02f0c442..39be107fd 100644
index d2d4ff6fb..65297a761 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -175,7 +175,12 @@ public abstract class TileEntity {
@ -23,10 +23,10 @@ index e02f0c442..39be107fd 100644
public String a() throws Exception {
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 71882a169..6a46e1f79 100644
index 3298cbe6b..c25e65428 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1450,10 +1450,12 @@ public abstract class World implements IBlockAccess {
@@ -1451,10 +1451,12 @@ public abstract class World implements IBlockAccess {
entity.tickTimer.stopTiming(); // Paper
} catch (Throwable throwable1) {
entity.tickTimer.stopTiming();
@ -43,7 +43,7 @@ index 71882a169..6a46e1f79 100644
}
}
@@ -1516,10 +1518,13 @@ public abstract class World implements IBlockAccess {
@@ -1519,10 +1521,13 @@ public abstract class World implements IBlockAccess {
((ITickable) tileentity).e();
this.methodProfiler.b();
} catch (Throwable throwable2) {
@ -62,5 +62,5 @@ index 71882a169..6a46e1f79 100644
// Spigot start
finally {
--
2.13.3
2.13.3.windows.1

14
Spigot-Server-Patches/0028-Lighting-Queue.patch
View File

@ -1,4 +1,4 @@
From 2ca7feba7bc12128f31ae48a356203e098f1624f Mon Sep 17 00:00:00 2001
From e9f9bada83c268b1e5c99edd85dd13107d8b48b6 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue
@ -97,10 +97,10 @@ index c1b0d6cea..ba720204d 100644
// Update neighbor counts
for (int x = -2; x < 3; x++) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9d2f3b834..9c65c2949 100644
index f4d0e2678..5b0431c57 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -721,7 +721,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -722,7 +722,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
protected void C() throws ExceptionWorldConflict { // CraftBukkit - added throws
co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
this.slackActivityAccountant.tickStarted(); // Spigot
@ -109,7 +109,7 @@ index 9d2f3b834..9c65c2949 100644
++this.ticks;
if (this.T) {
@@ -782,6 +782,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -783,6 +783,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.methodProfiler.b();
org.spigotmc.WatchdogThread.tick(); // Spigot
@ -225,10 +225,10 @@ index 000000000..d8d3e1efd
+ }
+}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6a46e1f79..b41061656 100644
index c25e65428..763f21570 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -390,7 +390,7 @@ public abstract class World implements IBlockAccess {
@@ -391,7 +391,7 @@ public abstract class World implements IBlockAccess {
} else {
if (iblockdata.c() != iblockdata1.c() || iblockdata.d() != iblockdata1.d()) {
this.methodProfiler.a("checkLight");
@ -238,5 +238,5 @@ index 6a46e1f79..b41061656 100644
}
--
2.13.3
2.13.3.windows.1

14
Spigot-Server-Patches/0032-Optimize-explosions.patch
View File

@ -1,4 +1,4 @@
From c8b6c8a0c2475c35a694ea746f3a7702f8aaf3de Mon Sep 17 00:00:00 2001
From 364b6430061c2056ad9cc389dd712a6b53cb56a0 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 11:59:48 -0600
Subject: [PATCH] Optimize explosions
@ -124,10 +124,10 @@ index a1ebcf858..e7f0e84d4 100644
+ // Paper end
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9c65c2949..6e11ba5b6 100644
index 5b0431c57..a5e3b13cc 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -886,6 +886,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -889,6 +889,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
worldserver.getTracker().updatePlayers();
this.methodProfiler.b();
this.methodProfiler.b();
@ -136,10 +136,10 @@ index 9c65c2949..6e11ba5b6 100644
// this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b41061656..7de1cd31c 100644
index 763f21570..7aeb46d12 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -15,6 +15,7 @@ import javax.annotation.Nullable;
@@ -16,6 +16,7 @@ import javax.annotation.Nullable;
// CraftBukkit start
import com.google.common.collect.Maps;
@ -147,7 +147,7 @@ index b41061656..7de1cd31c 100644
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.block.BlockState;
@@ -137,6 +138,7 @@ public abstract class World implements IBlockAccess {
@@ -138,6 +139,7 @@ public abstract class World implements IBlockAccess {
private org.spigotmc.TickLimiter entityLimiter;
private org.spigotmc.TickLimiter tileLimiter;
private int tileTickPosition;
@ -156,5 +156,5 @@ index b41061656..7de1cd31c 100644
public CraftWorld getWorld() {
return this.world;
--
2.13.3
2.13.3.windows.1

10
Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
View File

@ -1,14 +1,14 @@
From bf725c1a56036f1b365db11682d992852beafefa Mon Sep 17 00:00:00 2001
From 5076dee348aa990ba8c5e71af0127260b01dd697 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 23:45:17 -0600
Subject: [PATCH] Disable spigot tick limiters
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7de1cd31c..9c7675996 100644
index 7aeb46d12..df8b330a5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1427,10 +1427,10 @@ public abstract class World implements IBlockAccess {
@@ -1428,10 +1428,10 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Use field for loop variable
co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
int entitiesThisCycle = 0;
@ -23,7 +23,7 @@ index 7de1cd31c..9c7675996 100644
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
entity = (Entity) this.entityList.get(this.tickPosition);
// CraftBukkit end
@@ -1496,9 +1496,7 @@ public abstract class World implements IBlockAccess {
@@ -1497,9 +1497,7 @@ public abstract class World implements IBlockAccess {
// Spigot start
// Iterator iterator = this.tileEntityListTick.iterator();
int tilesThisCycle = 0;
@ -35,5 +35,5 @@ index 7de1cd31c..9c7675996 100644
TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
// Spigot start
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
View File

@ -1,4 +1,4 @@
From dd43dc2776791cc32d13c13c3b41b69e1338a194 Mon Sep 17 00:00:00 2001
From 181cef0697ca43aa730223a75d278d9803146a71 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:17:12 -0600
Subject: [PATCH] Ensure commands are not ran async
@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
that it is happening so that plugin authors can fix their code to stop executing commands async.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f7326aeec..cd88ae7b7 100644
index 03bbac737..4f784742c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1299,6 +1299,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1300,6 +1300,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
if (!async && s.startsWith("/")) {
@ -82,5 +82,5 @@ index 24fcdd382..f28471901 100644
return true;
}
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
View File

@ -1,14 +1,14 @@
From e38ec7282ebbcd915a447b0f169b44928de95196 Mon Sep 17 00:00:00 2001
From f5d86c4e83afdc7def0962b105d37cb4e881a0c2 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:18:39 -0600
Subject: [PATCH] Be a bit more informative in maxHealth exception
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 5fbd12471..062a0fd55 100644
index e2083fb29..f641c6dc1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -96,7 +96,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -98,7 +98,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setHealth(double health) {
health = (float) health;
if ((health < 0) || (health > getMaxHealth())) {
@ -21,5 +21,5 @@ index 5fbd12471..062a0fd55 100644
getHandle().setHealth((float) health);
--
2.12.2
2.13.3.windows.1

14
Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
View File

@ -1,11 +1,11 @@
From 93d284c42ac17c1442ce4610dea85261ea91c46c Mon Sep 17 00:00:00 2001
From b3a51f2ce44e39c2fb185c5eb0020b9a767f5a79 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:39:54 -0600
Subject: [PATCH] Change implementation of (tile)entity removal list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e8daa9d9d..d41d1103e 100644
index 3486451b3..26ecf2c70 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -122,10 +122,10 @@ public abstract class Entity implements ICommandListener {
@ -24,10 +24,10 @@ index e8daa9d9d..d41d1103e 100644
public boolean impulse;
public int portalCooldown;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9c7675996..307ef6dff 100644
index df8b330a5..1bb2a1a56 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -31,6 +31,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import org.bukkit.generator.ChunkGenerator;
// CraftBukkit end
@ -39,7 +39,7 @@ index 9c7675996..307ef6dff 100644
public abstract class World implements IBlockAccess {
private int a = 63;
@@ -60,11 +65,11 @@ public abstract class World implements IBlockAccess {
@@ -61,11 +66,11 @@ public abstract class World implements IBlockAccess {
}
};
// Spigot end
@ -53,7 +53,7 @@ index 9c7675996..307ef6dff 100644
public final List<EntityHuman> players = Lists.newArrayList();
public final List<Entity> j = Lists.newArrayList();
protected final IntHashMap<Entity> entitiesById = new IntHashMap();
@@ -1398,20 +1403,20 @@ public abstract class World implements IBlockAccess {
@@ -1399,20 +1404,20 @@ public abstract class World implements IBlockAccess {
this.entityList.removeAll(this.f);
int j;
@ -84,5 +84,5 @@ index 9c7675996..307ef6dff 100644
this.f.clear();
this.l();
--
2.13.3
2.13.3.windows.1

10
Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From fa59fa6c49d99b9e50bff39d8dae5ec6cfb62a68 Mon Sep 17 00:00:00 2001
From df6d49ffc0e5caacd6f49c418ed2c65aa80d5e4c Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event
@ -293,7 +293,7 @@ index 9ff4f23ab..6fce3015f 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 307ef6dff..e175d2891 100644
index 1bb2a1a56..22497993c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@
@ -304,7 +304,7 @@ index 307ef6dff..e175d2891 100644
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.Predicate;
@@ -1458,8 +1460,10 @@ public abstract class World implements IBlockAccess {
@@ -1459,8 +1461,10 @@ public abstract class World implements IBlockAccess {
} catch (Throwable throwable1) {
entity.tickTimer.stopTiming();
// Paper start - Prevent tile entity and entity crashes
@ -316,7 +316,7 @@ index 307ef6dff..e175d2891 100644
entity.dead = true;
continue;
// Paper end
@@ -1524,8 +1528,10 @@ public abstract class World implements IBlockAccess {
@@ -1527,8 +1531,10 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
} catch (Throwable throwable2) {
// Paper start - Prevent tile entity and entity crashes
@ -373,5 +373,5 @@ index 19adb77b5..b9d93a01f 100644
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch
View File

@ -1,14 +1,14 @@
From 1569e10a8346a25585e49ff76a7fff77777fb766 Mon Sep 17 00:00:00 2001
From c9b607383318c5e3af4b0afb7d77ecf2f32a93c8 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:43:39 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 06f2ddd85..3c3e8b873 100644
index f641c6dc1..1eafdecb4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -570,4 +570,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -538,4 +538,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public boolean isCollidable() {
return getHandle().collides;
}
@ -26,5 +26,5 @@ index 06f2ddd85..3c3e8b873 100644
+ // Paper end
}
--
2.13.0
2.13.3.windows.1

6
Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
View File

@ -1,14 +1,14 @@
From 32797ba6bb12cc69a872089e579167488676c3d9 Mon Sep 17 00:00:00 2001
From f41e730aab7129fd783861b1a6d57c838b9f58e4 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cd88ae7b7..2c4f8e311 100644
index 4f784742c..a6436a8e0 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1060,7 +1060,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1061,7 +1061,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start
public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.x());

14
Spigot-Server-Patches/0075-Add-World-Util-Methods.patch
View File

@ -1,4 +1,4 @@
From 05f72559e6fec57fb264f1ce6cd8d8e148e6b1ae Mon Sep 17 00:00:00 2001
From 514130481f7133c11f95558ccfa0c017558d9770 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 20:16:03 -0400
Subject: [PATCH] Add World Util Methods
@ -18,10 +18,10 @@ index 33737af78..1a77dfe4e 100644
int j = blockposition.getX() & 15;
int k = blockposition.getY();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e175d2891..0ece629d8 100644
index 22497993c..557660163 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -76,7 +76,7 @@ public abstract class World implements IBlockAccess {
@@ -77,7 +77,7 @@ public abstract class World implements IBlockAccess {
public final List<Entity> j = Lists.newArrayList();
protected final IntHashMap<Entity> entitiesById = new IntHashMap();
private final long K = 16777215L;
@ -30,7 +30,7 @@ index e175d2891..0ece629d8 100644
protected int l = (new Random()).nextInt();
protected final int m = 1013904223;
protected float n;
@@ -155,6 +155,12 @@ public abstract class World implements IBlockAccess {
@@ -156,6 +156,12 @@ public abstract class World implements IBlockAccess {
return (CraftServer) Bukkit.getServer();
}
@ -43,7 +43,7 @@ index e175d2891..0ece629d8 100644
public Chunk getChunkIfLoaded(int x, int z) {
return ((ChunkProviderServer) this.chunkProvider).getChunkIfLoaded(x, z);
}
@@ -685,10 +691,46 @@ public abstract class World implements IBlockAccess {
@@ -686,10 +692,46 @@ public abstract class World implements IBlockAccess {
}
}
@ -90,7 +90,7 @@ index e175d2891..0ece629d8 100644
public int c(BlockPosition blockposition, boolean flag) {
if (blockposition.getX() >= -30000000 && blockposition.getZ() >= -30000000 && blockposition.getX() < 30000000 && blockposition.getZ() < 30000000) {
if (flag && this.getType(blockposition).f()) {
@@ -804,6 +846,27 @@ public abstract class World implements IBlockAccess {
@@ -805,6 +847,27 @@ public abstract class World implements IBlockAccess {
return this.worldProvider.o()[this.getLightLevel(blockposition)];
}
@ -119,5 +119,5 @@ index e175d2891..0ece629d8 100644
// CraftBukkit start - tree generation
if (captureTreeGeneration) {
--
2.13.3
2.13.3.windows.1

26
Spigot-Server-Patches/0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
View File

@ -1,4 +1,4 @@
From e58268a1743bb0ccfeea7b53d56e0b2597ae5767 Mon Sep 17 00:00:00 2001
From cee3de8032c55ffbda6f413afdd1266931ce2122 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -99,10 +99,10 @@ index 3d784d0dc..afdc4a779 100644
private NibbleArray skyLight;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0ece629d8..68845fc64 100644
index 557660163..8f4c7e95e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -276,12 +276,12 @@ public abstract class World implements IBlockAccess {
@@ -277,12 +277,12 @@ public abstract class World implements IBlockAccess {
return this.getType(blockposition1);
}
@ -119,7 +119,7 @@ index 0ece629d8..68845fc64 100644
}
public boolean isEmpty(BlockPosition blockposition) {
@@ -377,7 +377,7 @@ public abstract class World implements IBlockAccess {
@@ -378,7 +378,7 @@ public abstract class World implements IBlockAccess {
return true;
}
// CraftBukkit end
@ -128,7 +128,7 @@ index 0ece629d8..68845fc64 100644
return false;
} else if (!this.isClientSide && this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) {
return false;
@@ -694,7 +694,7 @@ public abstract class World implements IBlockAccess {
@@ -695,7 +695,7 @@ public abstract class World implements IBlockAccess {
// Paper start - test if meets light level, return faster
// logic copied from below
public boolean isLightLevel(BlockPosition blockposition, int level) {
@ -137,7 +137,7 @@ index 0ece629d8..68845fc64 100644
if (this.getType(blockposition).f()) {
if (this.c(blockposition.up(), false) >= level) {
return true;
@@ -813,7 +813,7 @@ public abstract class World implements IBlockAccess {
@@ -814,7 +814,7 @@ public abstract class World implements IBlockAccess {
blockposition = new BlockPosition(blockposition.getX(), 0, blockposition.getZ());
}
@ -146,7 +146,7 @@ index 0ece629d8..68845fc64 100644
return enumskyblock.c;
} else if (!this.isLoaded(blockposition)) {
return enumskyblock.c;
@@ -825,7 +825,7 @@ public abstract class World implements IBlockAccess {
@@ -826,7 +826,7 @@ public abstract class World implements IBlockAccess {
}
public void a(EnumSkyBlock enumskyblock, BlockPosition blockposition, int i) {
@ -155,7 +155,7 @@ index 0ece629d8..68845fc64 100644
if (this.isLoaded(blockposition)) {
Chunk chunk = this.getChunkAtWorldCoords(blockposition);
@@ -849,19 +849,19 @@ public abstract class World implements IBlockAccess {
@@ -850,19 +850,19 @@ public abstract class World implements IBlockAccess {
// Paper start - reduces need to do isLoaded before getType
public IBlockData getTypeIfLoaded(BlockPosition blockposition) {
// CraftBukkit start - tree generation
@ -183,7 +183,7 @@ index 0ece629d8..68845fc64 100644
}
return null;
}
@@ -869,24 +869,33 @@ public abstract class World implements IBlockAccess {
@@ -870,24 +870,33 @@ public abstract class World implements IBlockAccess {
public IBlockData getType(BlockPosition blockposition) {
// CraftBukkit start - tree generation
@ -228,7 +228,7 @@ index 0ece629d8..68845fc64 100644
public boolean D() {
return this.L < 4;
@@ -2026,7 +2035,7 @@ public abstract class World implements IBlockAccess {
@@ -2029,7 +2038,7 @@ public abstract class World implements IBlockAccess {
public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
@Nullable
public TileEntity getTileEntity(BlockPosition blockposition) {
@ -237,7 +237,7 @@ index 0ece629d8..68845fc64 100644
return null;
} else {
// CraftBukkit start
@@ -2067,7 +2076,7 @@ public abstract class World implements IBlockAccess {
@@ -2070,7 +2079,7 @@ public abstract class World implements IBlockAccess {
}
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@ -246,7 +246,7 @@ index 0ece629d8..68845fc64 100644
if (tileentity != null && !tileentity.y()) {
// CraftBukkit start
if (captureBlockStates) {
@@ -2130,7 +2139,7 @@ public abstract class World implements IBlockAccess {
@@ -2133,7 +2142,7 @@ public abstract class World implements IBlockAccess {
}
public boolean d(BlockPosition blockposition, boolean flag) {
@ -256,5 +256,5 @@ index 0ece629d8..68845fc64 100644
} else {
Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
View File

@ -1,4 +1,4 @@
From 7b1457ca1476ddf68791945a763403654220e4a3 Mon Sep 17 00:00:00 2001
From 58716693b71c7fe0eb53760254811832d8b6527a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 19:55:45 -0400
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@ -25,10 +25,10 @@ index adc810720..e706efff5 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 68845fc64..6953415b2 100644
index 8f4c7e95e..6bb711d1f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -581,7 +581,7 @@ public abstract class World implements IBlockAccess {
@@ -582,7 +582,7 @@ public abstract class World implements IBlockAccess {
try {
// CraftBukkit start
CraftWorld world = ((WorldServer) this).getWorld();
@ -67,5 +67,5 @@ index 8e4697a00..3865b31cb 100644
timing.stopTiming(); // Paper
} else {
--
2.13.3
2.13.3.windows.1

10
Spigot-Server-Patches/0092-Entity-AddTo-RemoveFrom-World-Events.patch
View File

@ -1,14 +1,14 @@
From fb2d9badf4002a2c21565ae95d7c9e1fc541db39 Mon Sep 17 00:00:00 2001
From d5c5dbd1a9fbff14c4f8d3da5c15365c8ed741bf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:32:58 -0400
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6953415b2..35cc0f6dd 100644
index 6bb711d1f..79216be29 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1186,6 +1186,7 @@ public abstract class World implements IBlockAccess {
@@ -1187,6 +1187,7 @@ public abstract class World implements IBlockAccess {
}
entity.valid = true; // CraftBukkit
@ -16,7 +16,7 @@ index 6953415b2..35cc0f6dd 100644
}
protected void c(Entity entity) {
@@ -1193,6 +1194,7 @@ public abstract class World implements IBlockAccess {
@@ -1194,6 +1195,7 @@ public abstract class World implements IBlockAccess {
((IWorldAccess) this.u.get(i)).b(entity);
}
@ -25,5 +25,5 @@ index 6953415b2..35cc0f6dd 100644
}
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0099-Do-not-load-chunks-for-light-checks.patch
View File

@ -1,4 +1,4 @@
From 57b5f69c07d281e2d1ef1830898882f47a56b79d Mon Sep 17 00:00:00 2001
From 4bc812256242f853920650f26f7626f2a4a4fc21 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 31 Mar 2016 19:17:58 -0400
Subject: [PATCH] Do not load chunks for light checks
@ -7,10 +7,10 @@ Should only happen for blocks on the edge that uses neighbors light level
(certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 35cc0f6dd..44bf2a1c2 100644
index 79216be29..7164f224f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -763,6 +763,7 @@ public abstract class World implements IBlockAccess {
@@ -764,6 +764,7 @@ public abstract class World implements IBlockAccess {
if (blockposition.getY() >= 256) {
blockposition = new BlockPosition(blockposition.getX(), 255, blockposition.getZ());
}
@ -19,5 +19,5 @@ index 35cc0f6dd..44bf2a1c2 100644
Chunk chunk = this.getChunkAtWorldCoords(blockposition);
--
2.13.3
2.13.3.windows.1

10
Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
View File

@ -1,11 +1,11 @@
From 6e3b2cd9714a42a94043d35b6f4805e97ce1d975 Mon Sep 17 00:00:00 2001
From cbf484f184ba45dc1ecf716a27fe16cf705707b2 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 05:09:16 -0400
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
index c67cb54a..521f4626 100644
index c67cb54a3..521f46262 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
+++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@ -18,10 +18,10 @@ index c67cb54a..521f4626 100644
private Vec3D c;
private EnumHand d;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 643c8e12..4c90d1d4 100644
index a6436a8e0..1eb8275b9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1645,6 +1645,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1646,6 +1646,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
}
}
@ -39,5 +39,5 @@ index 643c8e12..4c90d1d4 100644
}
--
2.13.1.windows.2
2.13.3.windows.1

12
Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
View File

@ -1,4 +1,4 @@
From d058e49ce71755c48c90aa025f8029d87a402109 Mon Sep 17 00:00:00 2001
From dfe77a67a5e52ca18384f004a065c17de5870270 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 13 Sep 2014 23:14:43 -0400
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -21,10 +21,10 @@ index 74a49a5fb..3a942c763 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6e11ba5b6..71b66bbdf 100644
index a5e3b13cc..57f508e42 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -356,8 +356,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -357,8 +357,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
long j = aw();
i = 0;
@ -39,10 +39,10 @@ index 6e11ba5b6..71b66bbdf 100644
if (i1 - j > 1000L) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 44bf2a1c2..95b3deae7 100644
index 7164f224f..f235f7483 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3209,8 +3209,9 @@ public abstract class World implements IBlockAccess {
@@ -3212,8 +3212,9 @@ public abstract class World implements IBlockAccess {
int k = i * 16 + 8 - blockposition.getX();
int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true;
@ -83,5 +83,5 @@ index 843a3415f..24b4a7ea7 100644
loadChunk(chunkCoordX + x, chunkCoordZ + z);
} else {
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
View File

@ -1,14 +1,14 @@
From bdb137383d0d801d190e02edd321194dc2e2f1b3 Mon Sep 17 00:00:00 2001
From 17d62977b12c1bd7bf5c0ac9bd7f460e7ecfbaa4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Apr 2016 17:48:50 -0400
Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 95b3deae7..e1c4a37c1 100644
index f235f7483..0ee112756 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -535,6 +535,7 @@ public abstract class World implements IBlockAccess {
@@ -536,6 +536,7 @@ public abstract class World implements IBlockAccess {
}
public void applyPhysics(BlockPosition blockposition, Block block, boolean flag) {
@ -17,5 +17,5 @@ index 95b3deae7..e1c4a37c1 100644
this.a(blockposition.east(), block, blockposition);
this.a(blockposition.down(), block, blockposition);
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
View File

@ -1,14 +1,14 @@
From 4e33772166c6cbb7f87f5acfe4e0f3efd796f32d Mon Sep 17 00:00:00 2001
From 43f5fa426b70b792e3e7c4bb60487ac6ba9473da Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Apr 2016 19:42:22 -0400
Subject: [PATCH] Don't spam reload spawn chunks in nether/end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e1c4a37c1..f0825538c 100644
index 0ee112756..35f0b79d3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3205,6 +3205,7 @@ public abstract class World implements IBlockAccess {
@@ -3208,6 +3208,7 @@ public abstract class World implements IBlockAccess {
return this.P;
}
@ -29,5 +29,5 @@ index d0265f960..35d8d1a6e 100644
}
}
--
2.13.3
2.13.3.windows.1

12
Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
View File

@ -1,11 +1,11 @@
From 15e97b9f1f1f18bd04fe19e3658909671796f98a Mon Sep 17 00:00:00 2001
From cd1e07c1a8d63b99e61513857055f9f0c2c0190b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 6 Apr 2016 01:04:23 -0500
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 3a942c76..3bd29650 100644
index 3a942c763..3bd29650c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -290,4 +290,9 @@ public class PaperWorldConfig {
@ -19,7 +19,7 @@ index 3a942c76..3bd29650 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9bd55e6a..0d92e604 100644
index 92605e32c..79e6ab41b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2073,6 +2073,7 @@ public abstract class Entity implements ICommandListener {
@ -31,10 +31,10 @@ index 9bd55e6a..0d92e604 100644
public ScoreboardTeamBase aY() {
if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4c90d1d4..75f43f42 100644
index 1eb8275b9..e6c3f15ae 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1378,7 +1378,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1379,7 +1379,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
return;
}
@ -51,5 +51,5 @@ index 4c90d1d4..75f43f42 100644
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
for (Object recipient : minecraftServer.getPlayerList().players) {
--
2.13.1.windows.2
2.13.3.windows.1

18
Spigot-Server-Patches/0109-Remove-unused-World-Tile-Entity-List.patch
View File

@ -1,4 +1,4 @@
From 996fd09ea891e189069e2f93750015e43a320558 Mon Sep 17 00:00:00 2001
From 6ef7899b07cdbd17adab2f3e43d5a359ebf9ac38 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 00:25:28 -0400
Subject: [PATCH] Remove unused World Tile Entity List
@ -6,10 +6,10 @@ Subject: [PATCH] Remove unused World Tile Entity List
Massive hit to performance and it is completely unnecessary.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f0825538c..7f3c2c8a7 100644
index 35f0b79d3..6d452a968 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@@ -69,7 +69,7 @@ public abstract class World implements IBlockAccess {
};
// Spigot end
protected final Set<Entity> f = Sets.newHashSet(); // Paper
@ -18,7 +18,7 @@ index f0825538c..7f3c2c8a7 100644
public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
private final List<TileEntity> b = Lists.newArrayList();
private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
@@ -1573,7 +1573,7 @@ public abstract class World implements IBlockAccess {
@@ -1574,7 +1574,7 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - From below, clean up tile entities before ticking them
if (!this.tileEntityListUnload.isEmpty()) {
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@ -27,7 +27,7 @@ index f0825538c..7f3c2c8a7 100644
this.tileEntityListUnload.clear();
}
// CraftBukkit end
@@ -1624,7 +1624,7 @@ public abstract class World implements IBlockAccess {
@@ -1627,7 +1627,7 @@ public abstract class World implements IBlockAccess {
if (tileentity.y()) {
tilesThisCycle--;
this.tileEntityListTick.remove(tileTickPosition--);
@ -36,7 +36,7 @@ index f0825538c..7f3c2c8a7 100644
if (this.isLoaded(tileentity.getPosition())) {
this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
}
@@ -1662,7 +1662,7 @@ public abstract class World implements IBlockAccess {
@@ -1665,7 +1665,7 @@ public abstract class World implements IBlockAccess {
this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
// CraftBukkit start
// From above, don't screw this up - SPIGOT-1746
@ -45,7 +45,7 @@ index f0825538c..7f3c2c8a7 100644
this.a(tileentity1);
}
// CraftBukkit end
@@ -1682,9 +1682,9 @@ public abstract class World implements IBlockAccess {
@@ -1685,9 +1685,9 @@ public abstract class World implements IBlockAccess {
protected void l() {}
public boolean a(TileEntity tileentity) {
@ -57,7 +57,7 @@ index f0825538c..7f3c2c8a7 100644
this.tileEntityListTick.add(tileentity);
}
@@ -2123,7 +2123,7 @@ public abstract class World implements IBlockAccess {
@@ -2126,7 +2126,7 @@ public abstract class World implements IBlockAccess {
} else {
if (tileentity != null) {
this.b.remove(tileentity);
@ -67,5 +67,5 @@ index f0825538c..7f3c2c8a7 100644
}
--
2.13.3
2.13.3.windows.1

10
Spigot-Server-Patches/0111-Configurable-Player-Collision.patch
View File

@ -1,4 +1,4 @@
From 21967495ae6d6921239d59e93d97f7b459c41c55 Mon Sep 17 00:00:00 2001
From 38d63d20c31041a8f75ba8e44614c3435c8c9713 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 02:10:49 -0400
Subject: [PATCH] Configurable Player Collision
@ -37,10 +37,10 @@ index b08274d93..0607e55d3 100644
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 71b66bbdf..5db42beff 100644
index 57f508e42..f5d284ca3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -331,6 +331,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -332,6 +332,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.v.setPlayerFileData(this.worldServer);
this.a(this.getDifficulty());
this.l();
@ -75,7 +75,7 @@ index 549d4e89d..df11764e0 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 4b2865506..7adf5eb87 100644
index e6ed52b4a..30ca137e6 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -74,6 +74,7 @@ public abstract class PlayerList {
@ -132,5 +132,5 @@ index 4b2865506..7adf5eb87 100644
// CraftBukkit start
--
2.13.0
2.13.3.windows.1

12
Spigot-Server-Patches/0123-remove-null-possibility-for-getServer-singleton.patch
View File

@ -1,4 +1,4 @@
From 78749c44c2d63488063baba21bd95664ee59a2a8 Mon Sep 17 00:00:00 2001
From ddf26e44e9968aadbbfbaabbf0e0dbc9ea2196d7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 28 Apr 2016 00:57:27 -0400
Subject: [PATCH] remove null possibility for getServer singleton
@ -6,10 +6,10 @@ Subject: [PATCH] remove null possibility for getServer singleton
to stop IDE complaining about potential NPE
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5db42bef..41ef9bc2 100644
index f5d284ca3..948a04491 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -52,6 +52,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -53,6 +53,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
public abstract class MinecraftServer implements ICommandListener, Runnable, IAsyncTaskHandler, IMojangStatistics {
@ -17,7 +17,7 @@ index 5db42bef..41ef9bc2 100644
public static final Logger LOGGER = LogManager.getLogger();
public static final File a = new File("usercache.json");
public Convertable convertable;
@@ -123,6 +124,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -124,6 +125,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
// Spigot end
public MinecraftServer(OptionSet options, Proxy proxy, DataConverterManager dataconvertermanager, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
@ -25,7 +25,7 @@ index 5db42bef..41ef9bc2 100644
io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
this.e = proxy;
this.V = yggdrasilauthenticationservice;
@@ -1633,7 +1635,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -1636,7 +1638,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
// CraftBukkit start
@Deprecated
public static MinecraftServer getServer() {
@ -35,5 +35,5 @@ index 5db42bef..41ef9bc2 100644
// CraftBukkit end
}
--
2.13.1.windows.2
2.13.3.windows.1

10
Spigot-Server-Patches/0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
View File

@ -1,4 +1,4 @@
From 5a2d19c17acaf81b1c6f72d8d63fd44af32513dc Mon Sep 17 00:00:00 2001
From 90570f88597e87920b1fee8e41d71c6af763d429 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 29 Apr 2016 20:02:00 -0400
Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
Additionally, numerous issues to player position tracking on maps has been fixed.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index e9509e618..1673d0281 100644
index 5080290cd..1c841a907 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -548,6 +548,12 @@ public abstract class EntityHuman extends EntityLiving {
@ -48,10 +48,10 @@ index 4c6eb6ed1..759dacba7 100644
Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7f3c2c8a7..6ea36a120 100644
index 6d452a968..91cfed1e5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1224,6 +1224,7 @@ public abstract class World implements IBlockAccess {
@@ -1225,6 +1225,7 @@ public abstract class World implements IBlockAccess {
{
if ( iter.next().trackee == entity )
{
@ -145,5 +145,5 @@ index 256a13178..5768cd512 100644
public RenderData() {
--
2.13.3
2.13.3.windows.1

10
Spigot-Server-Patches/0133-Optimize-UserCache-Thread-Safe.patch
View File

@ -1,4 +1,4 @@
From a75966b00e4dc23e52f4d2ad245c731f9f919312 Mon Sep 17 00:00:00 2001
From 6c71a3974c2ab7d7adbbd06a63923019bdd64254 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 20:47:41 -0400
Subject: [PATCH] Optimize UserCache / Thread Safe
@ -10,10 +10,10 @@ Additionally, move Saving of the User cache to be done async, incase
the user never changed the default setting for Spigot's save on stop only.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 41ef9bc2..31ead884 100644
index 948a04491..9e43646eb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -527,7 +527,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -528,7 +528,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
// Spigot start
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
LOGGER.info("Saving usercache.json");
@ -23,7 +23,7 @@ index 41ef9bc2..31ead884 100644
// Spigot end
}
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
index 487fc11f..924dc63a 100644
index 487fc11f1..924dc63a4 100644
--- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -109,7 +109,7 @@ public class UserCache {
@ -96,5 +96,5 @@ index 487fc11f..924dc63a 100644
}
--
2.13.1.windows.2
2.13.3.windows.1

10
Spigot-Server-Patches/0144-Fix-Double-World-Add-issues.patch
View File

@ -1,4 +1,4 @@
From 9881feba202a4bcc2566a3c36a6fc038f862b1b7 Mon Sep 17 00:00:00 2001
From 5944c7e7b49872ffc7df3c9e183475beec1b4461 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 21 Jun 2016 22:54:34 -0400
Subject: [PATCH] Fix Double World Add issues
@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
Also add debug if something else tries to, and abort before world gets bad state
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 44f0d8831..6b5b5e912 100644
index 5e9879b89..cf0a8011d 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -508,7 +508,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -21,10 +21,10 @@ index 44f0d8831..6b5b5e912 100644
Iterator iterator = entity.bF().iterator();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6ea36a120..192e4b284 100644
index 91cfed1e5..5672689cf 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1102,6 +1102,7 @@ public abstract class World implements IBlockAccess {
@@ -1103,6 +1103,7 @@ public abstract class World implements IBlockAccess {
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot
if (entity == null) return false;
@ -33,5 +33,5 @@ index 6ea36a120..192e4b284 100644
int i = MathHelper.floor(entity.locX / 16.0D);
int j = MathHelper.floor(entity.locZ / 16.0D);
--
2.13.3
2.13.3.windows.1

12
Spigot-Server-Patches/0145-Fix-Old-Sign-Conversion.patch
View File

@ -1,4 +1,4 @@
From 339953875edbac09a67868577dd25fef80871623 Mon Sep 17 00:00:00 2001
From 6b7828f88b881660faf3dcf8ddadf580af5ceb1f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 17 Jun 2016 20:50:11 -0400
Subject: [PATCH] Fix Old Sign Conversion
@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion
This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
index d0f02f41..a8bc4b5f 100644
index cd6588de4..182936f2b 100644
--- a/src/main/java/net/minecraft/server/DefinedStructure.java
+++ b/src/main/java/net/minecraft/server/DefinedStructure.java
@@ -203,9 +203,11 @@ public class DefinedStructure {
@ -17,7 +17,7 @@ index d0f02f41..a8bc4b5f 100644
definedstructure_blockinfo1.c.setInt("y", blockposition1.getY());
definedstructure_blockinfo1.c.setInt("z", blockposition1.getZ());
+ tileentity.isLoadingStructure = true; // Paper
tileentity.a(definedstructure_blockinfo1.c);
tileentity.load(definedstructure_blockinfo1.c);
tileentity.a(definedstructureinfo.b());
tileentity.a(definedstructureinfo.c());
+ tileentity.isLoadingStructure = false; // Paper
@ -34,7 +34,7 @@ index d0f02f41..a8bc4b5f 100644
public Iterator<IBlockData> iterator() {
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 6e23d325..ddea15cf 100644
index 393c9089d..237f7e6fe 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -11,6 +11,7 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit
@ -46,7 +46,7 @@ index 6e23d325..ddea15cf 100644
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
protected World world;
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index 8bd12650..ba4f945a 100644
index 77a7b4458..54b719d91 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -77,13 +77,14 @@ public class TileEntitySign extends TileEntity {
@ -67,5 +67,5 @@ index 8bd12650..ba4f945a 100644
try {
this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
--
2.13.1.windows.2
2.13.3.windows.1

8
Spigot-Server-Patches/0147-More-informative-vehicle-moved-wrongly-message.patch
View File

@ -1,14 +1,14 @@
From 9d6de212c249e88c7e0dfc274e0c7c789cd5ae7b Mon Sep 17 00:00:00 2001
From 794376064968d36f41999ab9d720285d4ffdc74e Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 Jul 2016 17:58:53 -0500
Subject: [PATCH] More informative vehicle moved wrongly message
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 75f43f42..0233017e 100644
index e6c3f15ae..3dc034976 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -350,7 +350,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -351,7 +351,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
flag1 = true;
@ -18,5 +18,5 @@ index 75f43f42..0233017e 100644
entity.setLocation(d3, d4, d5, f, f1);
--
2.13.1.windows.2
2.13.3.windows.1

8
Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
View File

@ -1,14 +1,14 @@
From 3872dbb580dc8188d3def568a2f194305f35d4dc Mon Sep 17 00:00:00 2001
From bcbee74576d21dfc0526e833fb13d08d76c8775e Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Sun, 4 Sep 2016 16:35:43 -0500
Subject: [PATCH] Fix AIOOBE in inventory handling
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 0233017e..5a7318e8 100644
index 3dc034976..ad6854674 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1837,7 +1837,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1838,7 +1838,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
case CLONE:
if (packetplayinwindowclick.c() == 2) {
click = ClickType.MIDDLE;
@ -18,5 +18,5 @@ index 0233017e..5a7318e8 100644
} else {
Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
--
2.13.1.windows.2
2.13.3.windows.1

10
Spigot-Server-Patches/0153-Configurable-packet-in-spam-threshold.patch
View File

@ -1,11 +1,11 @@
From bbae8335f9953d51a7c60eca80ad2aa0e97d7ef4 Mon Sep 17 00:00:00 2001
From f54166832cee7a9973d72e2409cbcb3425682e00 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 11 Sep 2016 14:30:57 -0500
Subject: [PATCH] Configurable packet in spam threshold
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index cf06f8ac..2001175b 100644
index cf06f8ac3..2001175bf 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -235,4 +235,13 @@ public class PaperConfig {
@ -23,10 +23,10 @@ index cf06f8ac..2001175b 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5a7318e8..e2dce0ec 100644
index ad6854674..076f1e608 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -902,13 +902,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -903,13 +903,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// Spigot start - limit place/interactions
private int limitedPackets;
private long lastLimitedPacket = -1;
@ -44,5 +44,5 @@ index 5a7318e8..e2dce0ec 100644
limitedPackets = 0;
return true;
--
2.13.1.windows.2
2.13.3.windows.1

12
Spigot-Server-Patches/0154-Configurable-flying-kick-messages.patch
View File

@ -1,11 +1,11 @@
From 8808f6be84c5a3c26e7575fa0c379da2202a854e Mon Sep 17 00:00:00 2001
From 64a235f2f37f896fa9ef46af0791fc7bac72f131 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 20 Sep 2016 00:58:01 +0000
Subject: [PATCH] Configurable flying kick messages
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 2001175b..621c585e 100644
index 2001175bf..621c585e7 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -244,4 +244,11 @@ public class PaperConfig {
@ -21,10 +21,10 @@ index 2001175b..621c585e 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index e2dce0ec..2df4e5a4 100644
index 076f1e608..5855d2961 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -143,7 +143,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
if (this.B) {
if (++this.C > 80) {
PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", this.player.getName());
@ -33,7 +33,7 @@ index e2dce0ec..2df4e5a4 100644
return;
}
} else {
@@ -162,7 +162,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -163,7 +163,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
if (this.D && this.player.getVehicle().bE() == this.player) {
if (++this.E > 80) {
PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getName());
@ -43,5 +43,5 @@ index e2dce0ec..2df4e5a4 100644
}
} else {
--
2.13.1.windows.2
2.13.3.windows.1

16
Spigot-Server-Patches/0155-Auto-Save-Improvements.patch
View File

@ -1,4 +1,4 @@
From 106acbe429bea150b87a92d9862a94c1d5c03840 Mon Sep 17 00:00:00 2001
From bbd03ab220fef5955d62b11cf1f5a420e929c0b3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 19 Sep 2016 23:16:39 -0400
Subject: [PATCH] Auto Save Improvements
@ -76,7 +76,7 @@ index a0b5cd56b..f98d380f6 100644
public Random a(long i) {
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 9836c0c5a..39f0f5a17 100644
index df3235981..067c53b12 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -1,5 +1,6 @@
@ -96,7 +96,7 @@ index 9836c0c5a..39f0f5a17 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 5422b7d59..7ff7cc5d4 100644
index 1d1948e9c..ef211aedd 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -108,10 +108,10 @@ index 5422b7d59..7ff7cc5d4 100644
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 31ead8849..9fc484ce1 100644
index 9e43646eb..86eac80a1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -118,6 +118,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -119,6 +119,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
public final Thread primaryThread;
public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
public int autosavePeriod;
@ -119,7 +119,7 @@ index 31ead8849..9fc484ce1 100644
// CraftBukkit end
// Spigot start
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
@@ -765,22 +766,30 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -766,22 +767,30 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.q.b().a(agameprofile);
}
@ -155,7 +155,7 @@ index 31ead8849..9fc484ce1 100644
this.methodProfiler.a("tallying");
// Spigot start
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 7adf5eb87..73cf2e3d8 100644
index 30ca137e6..953e5f901 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -343,6 +343,7 @@ public abstract class PlayerList {
@ -215,5 +215,5 @@ index 3865b31cb..87a95857c 100644
timings.worldSaveChunks.startTiming(); // Paper
chunkproviderserver.a(flag);
--
2.13.0
2.13.3.windows.1

8
Spigot-Server-Patches/0156-Chunk-registration-fixes.patch
View File

@ -1,4 +1,4 @@
From 20cf38082e3cb4a6d8609320f704905bdac1a62a Mon Sep 17 00:00:00 2001
From d1ddd4222e4d590a02494dc3277010767529cd65 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 21 Sep 2016 22:54:28 -0400
Subject: [PATCH] Chunk registration fixes
@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
Keep them consistent
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 192e4b284..10239a644 100644
index 5672689cf..6b368216e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1773,7 +1773,7 @@ public abstract class World implements IBlockAccess {
@@ -1776,7 +1776,7 @@ public abstract class World implements IBlockAccess {
}
i = MathHelper.floor(entity.locX / 16.0D);
@ -21,5 +21,5 @@ index 192e4b284..10239a644 100644
if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) {
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0168-Optimize-Network-Queue.patch
View File

@ -1,14 +1,14 @@
From 123d1f9c1b5da03f8d7675f061d98ec968bbb326 Mon Sep 17 00:00:00 2001
From fce3d36c12fc004e027c4eee7d5de6e034bb9032 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es>
Date: Wed, 23 Nov 2016 12:54:56 -0500
Subject: [PATCH] Optimize Network Queue
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9fc484ce..eb585818 100644
index 86eac80a1..005e3449f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -103,7 +103,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -104,7 +104,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
private final GameProfileRepository X;
private final UserCache Y;
private long Z;
@ -18,5 +18,5 @@ index 9fc484ce..eb585818 100644
private long ab = aw();
--
2.13.1.windows.2
2.13.3.windows.1

8
Spigot-Server-Patches/0173-Optimize-World.isLoaded-BlockPosition-Z.patch
View File

@ -1,4 +1,4 @@
From 31e7726cd8505b1c7911976512f0b79f468334ee Mon Sep 17 00:00:00 2001
From b495a4c3b32ad02d02084cba9b399321fbb0ad5f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 2 Dec 2016 00:11:43 -0500
Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@ -6,10 +6,10 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
Reduce method invocations for World.isLoaded(BlockPosition)Z
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 10239a644..f9ee2af80 100644
index 6b368216e..de11ef617 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -289,7 +289,7 @@ public abstract class World implements IBlockAccess {
@@ -290,7 +290,7 @@ public abstract class World implements IBlockAccess {
}
public boolean isLoaded(BlockPosition blockposition) {
@ -19,5 +19,5 @@ index 10239a644..f9ee2af80 100644
public boolean a(BlockPosition blockposition, boolean flag) {
--
2.13.3
2.13.3.windows.1

14
Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch
View File

@ -1,11 +1,11 @@
From 32ce3dc56283c1575c091375db28077d42450c08 Mon Sep 17 00:00:00 2001
From 02fded4176f6ce406712e18df4075b70e1cbbfb2 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 16 Dec 2016 22:10:35 -0600
Subject: [PATCH] Vanished players don't have rights
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a53c46016..dc0c6d2d8 100644
index 7ff129181..13a307c43 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@ -18,7 +18,7 @@ index a53c46016..dc0c6d2d8 100644
protected int j;
private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
index c0d97f154..363209170 100644
index 60149c1ca..a5730d1c7 100644
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -20,7 +20,7 @@ public class ItemBlock extends Item {
@ -31,10 +31,10 @@ index c0d97f154..363209170 100644
IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f9ee2af80..b60cc0c31 100644
index de11ef617..5bd721814 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1808,6 +1808,33 @@ public abstract class World implements IBlockAccess {
@@ -1811,6 +1811,33 @@ public abstract class World implements IBlockAccess {
return this.a(axisalignedbb, (Entity) null);
}
@ -68,7 +68,7 @@ index f9ee2af80..b60cc0c31 100644
public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
List list = this.getEntities((Entity) null, axisalignedbb);
@@ -2698,7 +2725,7 @@ public abstract class World implements IBlockAccess {
@@ -2701,7 +2728,7 @@ public abstract class World implements IBlockAccess {
AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().d(this, blockposition);
// CraftBukkit start - store default return
@ -96,5 +96,5 @@ index 16f6410b2..883ef489f 100644
return event;
}
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
View File

@ -1,4 +1,4 @@
From 4f3a73aa862aae329def7a7b394634eb0df16ff8 Mon Sep 17 00:00:00 2001
From db77a614e7f10100de64a1cc512a5d6a479bbb4d Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:52:04 -0600
Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@ -19,10 +19,10 @@ index 32ca0a40e..70af657f5 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b60cc0c31..9dfc2b4d9 100644
index 5bd721814..12938b9f8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1336,6 +1336,7 @@ public abstract class World implements IBlockAccess {
@@ -1337,6 +1337,7 @@ public abstract class World implements IBlockAccess {
this.a(entity, axisalignedbb, false, arraylist);
if (entity != null) {
@ -31,5 +31,5 @@ index b60cc0c31..9dfc2b4d9 100644
for (int i = 0; i < list.size(); ++i) {
--
2.13.3
2.13.3.windows.1

14
Spigot-Server-Patches/0185-IllegalPacketEvent.patch
View File

@ -1,4 +1,4 @@
From 0b6115f9ec3330027efb0650f51b104310c2aff8 Mon Sep 17 00:00:00 2001
From 983a585c4c499ae187c5f1dbb651c01a9efc42f8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 23 Jun 2016 23:33:57 -0400
Subject: [PATCH] IllegalPacketEvent
@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
Fired for invalid data from players that represents hacking attempts
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 578837b53..dc92454ce 100644
index 5855d2961..22bc68a05 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -17,7 +17,7 @@ index 578837b53..dc92454ce 100644
import co.aikar.timings.MinecraftTimings; // Paper
// CraftBukkit end
@@ -2342,8 +2343,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2272,8 +2273,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
}
} catch (Exception exception) {
@ -27,7 +27,7 @@ index 578837b53..dc92454ce 100644
}
} else {
String s1;
@@ -2392,8 +2392,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2322,8 +2322,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
}
} catch (Exception exception1) {
@ -37,7 +37,7 @@ index 578837b53..dc92454ce 100644
}
} else if ("MC|TrSel".equals(s)) {
try {
@@ -2404,8 +2403,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2334,8 +2333,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
((ContainerMerchant) container).d(j);
}
} catch (Exception exception2) {
@ -47,7 +47,7 @@ index 578837b53..dc92454ce 100644
}
} else {
TileEntity tileentity;
@@ -2546,8 +2544,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2476,8 +2474,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
iinventory.update();
}
} catch (Exception exception5) {
@ -57,7 +57,7 @@ index 578837b53..dc92454ce 100644
}
}
} else if ("MC|ItemName".equals(s)) {
@@ -2646,8 +2643,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2576,8 +2573,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k)));
this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
} catch (Exception exception7) {

8
Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch
View File

@ -1,4 +1,4 @@
From 2724841a28fe26897b65b535824aefcd1aa4f646 Mon Sep 17 00:00:00 2001
From 1891b42bfd4249ead44a6c2893746d15aeb4b07f Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Tue, 27 Dec 2016 01:57:57 +0000
Subject: [PATCH] Properly fix item duplication bug
@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
Credit to prplz for figuring out the real issue
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index dc4d08fd4..354cbadb0 100644
index 410ad5390..07b92dc0a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1491,7 +1491,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -19,10 +19,10 @@ index dc4d08fd4..354cbadb0 100644
public void reset() {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index dc92454ce..c3309bc57 100644
index 22bc68a05..533cb281c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2686,6 +2686,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -2616,6 +2616,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start - Add "isDisconnected" method
public final boolean isDisconnected() {

8
Spigot-Server-Patches/0196-Fix-block-break-desync.patch
View File

@ -1,14 +1,14 @@
From c75ee4f24eede8cd5cb57a3a8167322524564c7f Mon Sep 17 00:00:00 2001
From fd17bc0e39c6b819ae1046dceeb3640a7e54f42a Mon Sep 17 00:00:00 2001
From: Michael Himing <mhiming@gmail.com>
Date: Sun, 8 Jan 2017 18:50:35 +1100
Subject: [PATCH] Fix block break desync
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 54c60717..831094c9 100644
index 533cb281c..14495d28c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -861,6 +861,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -862,6 +862,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
double d3 = d0 * d0 + d1 * d1 + d2 * d2;
if (d3 > 36.0D) {
@ -17,5 +17,5 @@ index 54c60717..831094c9 100644
} else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
return;
--
2.13.1.windows.2
2.13.3.windows.1

51
Spigot-Server-Patches/0199-Remove-the-Vanilla-Method-Profiler.patch
View File

@ -1,6 +1,6 @@
From 9d0f3de87d60210283c2810fab7fa104b0610071 Mon Sep 17 00:00:00 2001
From d0662dcab7314b3aa396ed533d59460ce144b153 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jan 2017 02:00:33 -0500
Date: Sat, 21 Jan 2017 08:00:33 +0100
Subject: [PATCH] Remove the Vanilla Method Profiler
Spigot rebrought this back after it was removed for years due to the performance hit.
@ -11,7 +11,7 @@ added, so we do not want any risk of performance degredation.
Paper has a proper Timings system that makes the Vanilla Method profiler obsolete and inferior.
diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
index 89708da9..7586168d 100644
index 89708da96..7586168db 100644
--- a/src/main/java/net/minecraft/server/CommandDebug.java
+++ b/src/main/java/net/minecraft/server/CommandDebug.java
@@ -35,12 +35,11 @@ public class CommandDebug extends CommandAbstract {
@ -40,28 +40,15 @@ index 89708da9..7586168d 100644
public List<String> tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) {
diff --git a/src/main/java/net/minecraft/server/MethodProfiler.java b/src/main/java/net/minecraft/server/MethodProfiler.java
index 20aa10c1..ebc324ed 100644
index 480e2ca97..a76d50723 100644
--- a/src/main/java/net/minecraft/server/MethodProfiler.java
+++ b/src/main/java/net/minecraft/server/MethodProfiler.java
@@ -9,8 +9,9 @@ import java.util.List;
import java.util.Map;
@@ -11,7 +11,31 @@ import java.util.function.Supplier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-
-public class MethodProfiler {
+// Paper - Remove this system - we have a more efficient Timings system
+/*
+class MethodProfiler {
public static final boolean ENABLED = Boolean.getBoolean("enableDebugMethodProfiler"); // CraftBukkit - disable unless specified in JVM arguments
private static final Logger b = LogManager.getLogger();
@@ -163,3 +164,22 @@ public class MethodProfiler {
}
}
}
+*/
+
+public class MethodProfiler {
+// Paper - Remove this system - we have a more efficient Timings system
public class MethodProfiler {
+ public boolean a;
+
+ MethodProfiler() {}
@ -70,14 +57,32 @@ index 20aa10c1..ebc324ed 100644
+
+ public final void a(String s) {}
+
+ public void a(Supplier<String> supplier) {}
+
+ public final void b() {}
+
+ public List<MethodProfiler.ProfilerInfo> b(String s) {
+ return Collections.emptyList();
+ }
+
+ public final void c(String s) {}
+
+ public final String c() {
+ return null;
+ return "[DISABLED]";
+ }
+}
+/*
+class MethodProfiler {
public static final boolean ENABLED = Boolean.getBoolean("enableDebugMethodProfiler"); // CraftBukkit - disable unless specified in JVM arguments
private static final Logger b = LogManager.getLogger();
@@ -149,6 +173,7 @@ public class MethodProfiler {
if (!ENABLED) return "[DISABLED]"; // CraftBukkit
return this.c.isEmpty() ? "[UNKNOWN]" : (String) this.c.get(this.c.size() - 1);
}
+*/
public static final class ProfilerInfo implements Comparable<MethodProfiler.ProfilerInfo> {
--
2.13.1.windows.2
2.13.3.windows.1

16
Spigot-Server-Patches/0207-Properly-handle-async-calls-to-restart-the-server.patch
View File

@ -1,4 +1,4 @@
From 57a80f8590fbad019ad0e95879dc06b101494c83 Mon Sep 17 00:00:00 2001
From d57850c1c1fc99b04ae06c6720c10ec168bfbd67 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 12 May 2017 23:34:11 -0500
Subject: [PATCH] Properly handle async calls to restart the server
@ -30,10 +30,10 @@ will have plugins and worlds saving to the disk has a high potential to result
in corruption/dataloss.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index eb5858189..d84f59da1 100644
index 005e3449f..a4f44b39b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -70,6 +70,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -71,6 +71,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
public WorldServer[] worldServer;
private PlayerList v;
private boolean isRunning = true;
@ -41,7 +41,7 @@ index eb5858189..d84f59da1 100644
private boolean isStopped;
private int ticks;
protected final Proxy e;
@@ -488,7 +489,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -489,7 +490,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
if (this.v != null) {
MinecraftServer.LOGGER.info("Saving players");
this.v.savePlayers();
@ -50,7 +50,7 @@ index eb5858189..d84f59da1 100644
try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
}
@@ -545,10 +546,18 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -546,10 +547,18 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
return this.isRunning;
}
@ -69,7 +69,7 @@ index eb5858189..d84f59da1 100644
// Paper start - Further improve server tick loop
private static final int TPS = 20;
private static final long SEC_IN_NANO = 1000000000;
@@ -1612,6 +1621,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -1615,6 +1624,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
return this.ab;
}
@ -78,7 +78,7 @@ index eb5858189..d84f59da1 100644
return this.serverThread;
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 206068384..17c251ba9 100644
index acec81a92..b8a0b67a9 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1367,10 +1367,15 @@ public abstract class PlayerList {
@ -306,5 +306,5 @@ index 49768734d..d51636c8e 100644
}
}
--
2.13.0
2.13.3.windows.1

12
Spigot-Server-Patches/0209-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
View File

@ -1,4 +1,4 @@
From 591059a3aeae4b5dcadaa646d84e9f3e4ec0ca88 Mon Sep 17 00:00:00 2001
From 4f6bd3337826922ebf63413a79ad5f5cc894ced2 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 16 May 2017 21:29:08 -0500
Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
To be converted into a Paper-API event at some point in the future?
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index af953dda..1ce3aaa8 100644
index af953dda4..1ce3aaa8c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -416,4 +416,10 @@ public class PaperWorldConfig {
@ -26,7 +26,7 @@ index af953dda..1ce3aaa8 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 1673d028..f5e25e63 100644
index 1c841a907..608f6550f 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -399,7 +399,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -39,10 +39,10 @@ index 1673d028..f5e25e63 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 831094c9..bcb09b8f 100644
index 14495d28c..53cf54d14 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1502,6 +1502,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1503,6 +1503,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
switch (packetplayinentityaction.b()) {
case START_SNEAKING:
this.player.setSneaking(true);
@ -57,5 +57,5 @@ index 831094c9..bcb09b8f 100644
case STOP_SNEAKING:
--
2.13.1.windows.2
2.13.3.windows.1

30
Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -1,4 +1,4 @@
From 75db35e815b491bb1ea36bb3cca1c0d99e7dfe55 Mon Sep 17 00:00:00 2001
From ca560725c1b5c5e9632e899b9e5a9f5391654b6c Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Fri, 9 Jun 2017 19:03:43 +0200
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -20,7 +20,7 @@ Other changes:
configuration
diff --git a/pom.xml b/pom.xml
index 4cac7e38e..420a47d94 100644
index bb305c7c2..7038aee82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,12 +54,6 @@
@ -75,7 +75,7 @@ index 4cac7e38e..420a47d94 100644
<!-- testing -->
<dependency>
<groupId>junit</groupId>
@@ -224,10 +250,18 @@
@@ -230,10 +256,18 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/java.sql.Driver</resource>
</transformer>
@ -184,7 +184,7 @@ index 000000000..d5bc61490
+
+}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index bfc0b0433..d1507c139 100644
index 3b8425915..059f6b6b5 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -237,10 +237,10 @@ index bfc0b0433..d1507c139 100644
System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d84f59da1..8ca8fdceb 100644
index a4f44b39b..ea2c57137 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -41,7 +41,6 @@ import org.apache.commons.lang3.Validate;
@@ -42,7 +42,6 @@ import org.apache.commons.lang3.Validate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
// CraftBukkit start
@ -248,7 +248,7 @@ index d84f59da1..8ca8fdceb 100644
import joptsimple.OptionSet;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.CraftServer;
@@ -114,7 +113,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -115,7 +114,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
public OptionSet options;
public org.bukkit.command.ConsoleCommandSender console;
public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
@ -257,7 +257,7 @@ index d84f59da1..8ca8fdceb 100644
public static int currentTick = 0; // Paper - Further improve tick loop
public final Thread primaryThread;
public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
@@ -140,7 +139,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -141,7 +140,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.dataConverterManager = dataconvertermanager;
// CraftBukkit start
this.options = options;
@ -267,7 +267,7 @@ index d84f59da1..8ca8fdceb 100644
if (System.console() == null && System.getProperty("jline.terminal") == null) {
System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
Main.useJline = false;
@@ -161,6 +162,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -162,6 +163,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
LOGGER.warn((String) null, ex);
}
}
@ -276,7 +276,7 @@ index d84f59da1..8ca8fdceb 100644
Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
this.serverThread = primaryThread = new Thread(this, "Server thread"); // Moved from main
@@ -700,7 +703,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -701,7 +704,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
} finally {
// CraftBukkit start - Restore terminal to original settings
try {
@ -285,7 +285,7 @@ index d84f59da1..8ca8fdceb 100644
} catch (Exception ignored) {
}
// CraftBukkit end
@@ -1226,7 +1229,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -1229,7 +1232,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
public void sendMessage(IChatBaseComponent ichatbasecomponent) {
@ -296,7 +296,7 @@ index d84f59da1..8ca8fdceb 100644
public boolean a(int i, String s) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 17c251ba9..c47e05c19 100644
index b8a0b67a9..ebca377e5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -78,8 +78,7 @@ public abstract class PlayerList {
@ -336,7 +336,7 @@ index c01c43394..bef164983 100644
@Override
public PluginCommand getPluginCommand(String name) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index ec9508e90..d3d848f8c 100644
index d565a720f..c9e8a8737 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -14,7 +14,7 @@ import java.util.logging.Logger;
@ -375,7 +375,7 @@ index ec9508e90..d3d848f8c 100644
+ System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
}
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
deleted file mode 100644
index 26a2fb894..000000000
@ -639,5 +639,5 @@ index 5cee8f00e..08b6bb7f9 100644
<AppenderRef ref="TerminalConsole" level="info"/>
</Root>
--
2.13.3
2.13.3.windows.1

8
Spigot-Server-Patches/0218-Profile-Lookup-Events.patch
View File

@ -1,4 +1,4 @@
From c5ae72ae942f1d3ce21c4aaa34849842598d2f03 Mon Sep 17 00:00:00 2001
From a39ef5463e9991e0d4517352d0563ae6598e06d5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 17:00:32 -0400
Subject: [PATCH] Profile Lookup Events
@ -7,10 +7,10 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
profiles that had to be looked up.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8ca8fdceb..ab8703106 100644
index ea2c57137..a2acf1b3e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1018,6 +1018,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -1021,6 +1021,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString());
MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
@ -19,5 +19,5 @@ index 8ca8fdceb..ab8703106 100644
final DedicatedServer dedicatedserver = new DedicatedServer(options, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache);
--
2.13.3
2.13.3.windows.1

4
Spigot-Server-Patches/0224-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch → Spigot-Server-Patches/0223-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
View File

@ -1,4 +1,4 @@
From 0f046d6d6906f3bfc49f815525a329ec91011970 Mon Sep 17 00:00:00 2001
From 307a2e3cc7e023f101c020a6e9b74df70083e1bf Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Fri, 5 May 2017 18:59:22 -0400
Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent
@ -64,5 +64,5 @@ index 313bb0007..45d6984f7 100644
playerSample.a(profiles.toArray(new GameProfile[profiles.size()]));
--
2.13.3
2.13.3.windows.1

93
Spigot-Server-Patches/0223-Fix-Recipe-Books.patch
View File

@ -1,93 +0,0 @@
From 69aecad8ffaaa88760f8c3b0b152cc80ec669eb0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 26 Jul 2017 21:12:15 -0400
Subject: [PATCH] Fix Recipe Books
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 682211cdd..034081cbe 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2027,12 +2027,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
public void a(PacketPlayInAutoRecipe packetplayinautorecipe) {
PlayerConnectionUtils.ensureMainThread(packetplayinautorecipe, this, this.player.x());
this.player.resetIdleTimer();
- // CraftBukkit start
- if (!player.getBukkitEntity().hasPermission("minecraft.autocraft")) {
- player.getBukkitEntity().updateInventory();
- return;
- }
- // CraftBukkit end
if (this.player.activeContainer.windowId == packetplayinautorecipe.a() && this.player.activeContainer.c(this.player)) {
this.player.playerConnection.sendPacket(new PacketPlayOutTransaction(packetplayinautorecipe.a(), packetplayinautorecipe.b(), true));
Iterator iterator;
@@ -2046,10 +2040,19 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
while (iterator.hasNext()) {
packetplayinautorecipe_a = (PacketPlayInAutoRecipe.a) iterator.next();
itemstack = this.player.activeContainer.getSlot(packetplayinautorecipe_a.b).getItem();
- if (this.a(packetplayinautorecipe_a.a, itemstack)) {
+ // Paper start - improve validation
+ int toSlot = packetplayinautorecipe_a.c;
+ ItemStack to = toSlot != -1 ? this.player.inventory.getItem(toSlot) : ItemStack.a;
+ ItemStack ref = packetplayinautorecipe_a.a;
+ if (this.a(ref, itemstack) && (to.isEmpty() || this.a(ref, to)) && (ref.getCount() + to.getCount() <= ref.getMaxStackSize())) {
+ // Paper end
i = packetplayinautorecipe_a.a.getCount();
if (packetplayinautorecipe_a.c == -1) {
- this.player.drop(packetplayinautorecipe_a.a, true);
+ // Paper start
+ this.player.drop(itemstack, true);
+ this.player.activeContainer.setItem(packetplayinautorecipe_a.b, ItemStack.a);
+ continue;
+ // Paper end
} else {
ItemStack itemstack1 = this.player.inventory.getItem(packetplayinautorecipe_a.c);
@@ -2066,6 +2069,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
itemstack.subtract(i);
}
}
+ // Paper start
+ else {
+ this.player.getBukkitEntity().updateInventory();
+ return;
+ }
+ // Paper end
}
}
@@ -2075,7 +2084,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
while (iterator.hasNext()) {
packetplayinautorecipe_a = (PacketPlayInAutoRecipe.a) iterator.next();
itemstack = this.player.inventory.getItem(packetplayinautorecipe_a.c);
- if (this.a(packetplayinautorecipe_a.a, itemstack)) {
+ // Paper start
+ ItemStack ref = packetplayinautorecipe_a.a;
+ ItemStack to = this.player.activeContainer.getSlot(packetplayinautorecipe_a.b).getItem();
+ if (this.a(ref, itemstack) && (to.isEmpty() || this.a(ref, to)) && (ref.getCount() + to.getCount() <= ref.getMaxStackSize())) {
+ // Paper end
i = packetplayinautorecipe_a.a.getCount();
if (itemstack.getCount() == i) {
this.player.inventory.splitWithoutUpdate(packetplayinautorecipe_a.c);
@@ -2083,8 +2096,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
itemstack.subtract(i);
}
- this.player.activeContainer.b(packetplayinautorecipe_a.b, packetplayinautorecipe_a.a);
+ // Paper start
+ if (to.isEmpty()) {
+ this.player.activeContainer.b(packetplayinautorecipe_a.b, packetplayinautorecipe_a.a);
+ } else {
+ to.add(i);
+ }
+ } else {
+ this.player.getBukkitEntity().updateInventory();
+ return;
}
+ // Paper end
}
}
--
2.13.0

4
Spigot-Server-Patches/0225-Improve-the-Saddle-API-for-Horses.patch → Spigot-Server-Patches/0224-Improve-the-Saddle-API-for-Horses.patch
View File

@ -1,4 +1,4 @@
From 676feaf53d0fe17a5ad8b25206195309f5ec16d0 Mon Sep 17 00:00:00 2001
From d34fe4dbcbd8a661092351c2be434cbacd70e10e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 10 Dec 2016 16:24:06 -0500
Subject: [PATCH] Improve the Saddle API for Horses
@ -83,5 +83,5 @@ index 000000000..615010c40
+ }
+}
--
2.13.3
2.13.3.windows.1

4
Spigot-Server-Patches/0226-Implement-ensureServerConversions-API.patch → Spigot-Server-Patches/0225-Implement-ensureServerConversions-API.patch
View File

@ -1,4 +1,4 @@
From 6794890ca2d6ab13b1c6af15fac72be26fedeb33 Mon Sep 17 00:00:00 2001
From 70c9c339ad2d62a199d09706abb17f42e5f51a3c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 22:43:12 -0400
Subject: [PATCH] Implement ensureServerConversions API
@ -23,5 +23,5 @@ index 49ebad22e..eb6987338 100644
+ // Paper end
}
--
2.13.3
2.13.3.windows.1

4
Spigot-Server-Patches/0227-Implement-getI18NDisplayName.patch → Spigot-Server-Patches/0226-Implement-getI18NDisplayName.patch
View File

@ -1,4 +1,4 @@
From ca50945328596a8fd4bcd750ee3e56917822c4fe Mon Sep 17 00:00:00 2001
From fb4c72cacd852f29acbcb22a3406793be954ae17 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:59:38 -0400
Subject: [PATCH] Implement getI18NDisplayName
@ -31,5 +31,5 @@ index eb6987338..c2f26577c 100644
// Paper end
}
--
2.13.3
2.13.3.windows.1

4
Spigot-Server-Patches/0228-GH-806-Respect-saving-disabled-before-unloading-all-.patch → Spigot-Server-Patches/0227-GH-806-Respect-saving-disabled-before-unloading-all-.patch
View File

@ -1,4 +1,4 @@
From b895a633d1f33fa6c237ddf6bee17010cd518b94 Mon Sep 17 00:00:00 2001
From f67bc29fc988afd5221a35203c1ed6553b076ae9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 27 Jul 2017 00:06:43 -0400
Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@ -22,5 +22,5 @@ index 14ea89c91..08e0cdf6d 100644
}
} // Paper timing
--
2.13.3
2.13.3.windows.1

6
Spigot-Server-Patches/0229-ProfileWhitelistVerifyEvent.patch → Spigot-Server-Patches/0228-ProfileWhitelistVerifyEvent.patch
View File

@ -1,11 +1,11 @@
From 86a8bd035f0378388b3a1488861e0ca35a696ea2 Mon Sep 17 00:00:00 2001
From a45c6794444636e4c22d8aceabfc5131e49ab47a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 3 Jul 2017 18:11:10 -0500
Subject: [PATCH] ProfileWhitelistVerifyEvent
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index c47e05c19..a038d0987 100644
index ebca377e5..c201e9cec 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -536,9 +536,9 @@ public abstract class PlayerList {
@ -48,5 +48,5 @@ index c47e05c19..a038d0987 100644
public boolean isOp(GameProfile gameprofile) {
return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit
--
2.13.3
2.13.3.windows.1

2
work/BuildData

@ -1 +1 @@
Subproject commit ebd264edb506ff3e72e92dd16b1b68c46905972c
Subproject commit 80d0a0138c11d926255e1b4d8b04d923ab969021

2
work/Bukkit

@ -1 +1 @@
Subproject commit 0ce77bc4b3825b1665b34f7dd6dc4b01a02e9443
Subproject commit 0aeac440c05a3ae3b69095e109372b7400f0feae

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 2c5c611d0c3c198c1ac904e8d64051a8437a8720
Subproject commit 2a927e8638f66bb076b68ae8a0d1d0ee9ae72732

2
work/Spigot

@ -1 +1 @@
Subproject commit 596221bf2ffd4e694d008406f7940a8a041a71fb
Subproject commit edd03964c6c1d7fb9617ac3f7183357dcbbc28fe