Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-06-25 22:34:51 +02:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
220bc594 #486: Add method to get player's attack cooldown
21853d39 SPIGOT-5681: Increase max plugin channel size
5b972adc Improve build process
b55e58d9 Note which custom generator is missing required method

CraftBukkit Changes:
893ad93b #650: Add method to get player's attack cooldown
ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender.
e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much
94cb030f SPIGOT-5673: swingHand API does not show to self
b331a055 SPIGOT-5680: isChunkGenerated creates empty region files
e1335932 Improve build process
a8ec1d60 Add a couple of method null checks to CraftWorld
ce66f693 Misc checkstyle fixes
8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated

Spigot Changes:
2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border
ab8f6b5a Rebuild patches
e7dc2f53 Rebuild patches
This commit is contained in:
Aikar 2020-04-27 03:34:45 -04:00
parent c03260a280
commit 842e040c19
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
104 changed files with 746 additions and 817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From 72e2e4af618fca06282903aa0100a779f2945168 Mon Sep 17 00:00:00 2001
From 61a761e78f673768b70af90087e6d52a7b4ec345 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 8964b9e3..ce09baea 100644
index 186405ba..1b6204ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,34 +2,28 @@
@ -85,13 +85,15 @@ index 8964b9e3..ce09baea 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -113,15 +125,12 @@
@@ -113,6 +125,7 @@
</dependencies>
<build>
+ <defaultGoal>clean install</defaultGoal>
<plugins>
<plugin>
<groupId>net.md-5</groupId>
@@ -131,10 +144,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
@ -102,27 +104,14 @@ index 8964b9e3..ce09baea 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -156,6 +165,7 @@
</execution>
</executions>
<configuration>
@@ -180,6 +189,7 @@
</excludes>
</filter>
</filters>
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
diff --git a/src/main/java/org/bukkit/event/player/PlayerEvent.java b/src/main/java/org/bukkit/event/player/PlayerEvent.java
index 793b661b..b7c8f2c3 100644
--- a/src/main/java/org/bukkit/event/player/PlayerEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerEvent.java
@@ -14,7 +14,7 @@ public abstract class PlayerEvent extends Event {
player = who;
}
- PlayerEvent(@NotNull final Player who, boolean async) {
+ public PlayerEvent(@NotNull final Player who, boolean async) { // Paper - wtf?
super(async);
player = who;
--
2.26.2

10
Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
View File

@ -1,11 +1,11 @@
From 0a6bf8a64b4096498da9a4846ec9cc81c7075f4e Mon Sep 17 00:00:00 2001
From 22a941921b2b5577054bbc53d0d21adb7dba5877 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 15:04:51 -0400
Subject: [PATCH] Shoulder Entities Release API
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 6277f3928..5b5fb3034 100644
index a7f08bb1..3adff676 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -324,6 +324,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@ -33,8 +33,8 @@ index 6277f3928..5b5fb3034 100644
+ // Paper end
+
/**
* Discover a recipe for this player such that it has not already been
* discovered. This method will add the key's associated recipe to the
* Gets the current cooldown for a player's attack.
*
--
2.25.1
2.26.2

8
Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
View File

@ -1,14 +1,14 @@
From b8f823a3d39e1cc99f25b85485225d9f1e8c980c Mon Sep 17 00:00:00 2001
From 1a4b026170e3aca5fdeacbc8c2cd499e0cd339dd Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 1 Apr 2018 02:28:43 +0300
Subject: [PATCH] Add method to open already placed sign
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 5b5fb3034..cdbac95bb 100644
index 3adff676..2d413d72 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -458,4 +458,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -468,4 +468,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
*/
@Deprecated
public void setShoulderEntityRight(@Nullable Entity entity);
@ -23,5 +23,5 @@ index 5b5fb3034..cdbac95bb 100644
+ // Paper end
}
--
2.25.1
2.26.2

22
Spigot-API-Patches/0185-Make-PlayerEvent-public.patch Normal file
View File

@ -0,0 +1,22 @@
From beaf1e5982a99ee4acf2f2efe7cef56ac7610ed3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 27 Apr 2020 02:40:34 -0400
Subject: [PATCH] Make PlayerEvent public
diff --git a/src/main/java/org/bukkit/event/player/PlayerEvent.java b/src/main/java/org/bukkit/event/player/PlayerEvent.java
index 793b661b..b7c8f2c3 100644
--- a/src/main/java/org/bukkit/event/player/PlayerEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerEvent.java
@@ -14,7 +14,7 @@ public abstract class PlayerEvent extends Event {
player = who;
}
- PlayerEvent(@NotNull final Player who, boolean async) {
+ public PlayerEvent(@NotNull final Player who, boolean async) { // Paper - wtf?
super(async);
player = who;
--
2.26.2

26
Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch
View File

@ -1,26 +0,0 @@
From 0726ea2828fb2a6d9eb5547abf7a71f5fc101c56 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io>
Date: Wed, 2 Oct 2019 21:24:28 -0500
Subject: [PATCH] Name the specific custom world gen plugin class that throws a
UOE
diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
index 70f20fb64..59138238b 100644
--- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
+++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
@@ -114,7 +114,10 @@ public abstract class ChunkGenerator {
*/
@NotNull
public ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) {
- throw new UnsupportedOperationException("Custom generator is missing required method generateChunkData");
+ // Paper start - More helpful custom chunk gen exceptions
+ final String generatorClass = world.getGenerator() != null ? world.getGenerator().getClass().getName() : "null";
+ throw new UnsupportedOperationException("Custom generator is missing required method generateChunkData: " + generatorClass);
+ // Paper end
}
/**
--
2.25.1

8
Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch
View File

@ -1,4 +1,4 @@
From 85a5ffd84b59580bcbdc8d4dd77e09c25c22527a Mon Sep 17 00:00:00 2001
From c936544e4c982dd62d8d17df2cee9e194963ba0b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 18 Oct 2019 17:39:05 +0100
Subject: [PATCH] Increase custom payload channel message size
@ -7,18 +7,18 @@ Doubles the custom payload size limit imposed by bukkit, also creates a system
property to allow customizing the size `paper.maxCustomChannelName`
diff --git a/src/main/java/org/bukkit/plugin/messaging/Messenger.java b/src/main/java/org/bukkit/plugin/messaging/Messenger.java
index ea9b525ff..682c77188 100644
index 9d2c68c8..682c7718 100644
--- a/src/main/java/org/bukkit/plugin/messaging/Messenger.java
+++ b/src/main/java/org/bukkit/plugin/messaging/Messenger.java
@@ -24,7 +24,7 @@ public interface Messenger {
/**
* Represents the largest size that a Plugin Channel may be.
*/
- public static final int MAX_CHANNEL_SIZE = 32;
- public static final int MAX_CHANNEL_SIZE = 64;
+ public static final int MAX_CHANNEL_SIZE = Integer.getInteger("paper.maxCustomChannelName", 64); // Paper
/**
* Checks if the specified channel is a reserved name.
--
2.25.1
2.26.2

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

@ -1,11 +1,11 @@
From e5972e429a6ce140fcdca52e906abf72e8c20243 Mon Sep 17 00:00:00 2001
From 734a32b574ec0430f7f2541b687c0a01f5481b07 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 def28b3bec..23f33d0477 100644
index 9fc92e347f..6cc18aa360 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,14 @@
@ -28,7 +28,7 @@ index def28b3bec..23f33d0477 100644
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version>
<minecraft.version>1.15.2</minecraft.version>
@@ -22,16 +21,22 @@
@@ -19,16 +18,22 @@
</properties>
<parent>
@ -55,7 +55,7 @@ index def28b3bec..23f33d0477 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -109,34 +114,22 @@
@@ -106,34 +111,22 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
@ -65,7 +65,7 @@ index def28b3bec..23f33d0477 100644
<plugin>
- <groupId>net.md-5</groupId>
- <artifactId>scriptus</artifactId>
- <version>0.3.2</version>
- <version>0.4.1</version>
+ <groupId>com.lukegb.mojo</groupId>
+ <artifactId>gitdescribe-maven-plugin</artifactId>
+ <version>1.3</version>
@ -101,30 +101,35 @@ index def28b3bec..23f33d0477 100644
</goals>
</execution>
</executions>
@@ -146,11 +139,13 @@
@@ -143,6 +136,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>3.2.0</version>
<configuration>
+ <forceCreation>true</forceCreation> <!-- Required to prevent shading the jar multiple times -->
<archive>
<manifest>
<addDefaultEntries>false</addDefaultEntries>
@@ -150,8 +144,9 @@
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
<Implementation-Title>CraftBukkit</Implementation-Title>
- <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
- <Implementation-Vendor>${project.build.outputTimestamp}</Implementation-Vendor>
+ <!--suppress MavenModelInspection -->
+ <Implementation-Version>${describe}</Implementation-Version>
<Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
+ <Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
<Specification-Vendor>Bukkit Team</Specification-Vendor>
@@ -190,6 +185,7 @@
<goal>shade</goal>
</goals>
<configuration>
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
<createSourcesJar>${shadeSourcesJar}</createSourcesJar>
<relocations>
<!-- Cannot be relocated as it breaks translation property keys -->
@@ -203,10 +199,11 @@
<filters>
<filter>
@@ -213,10 +209,11 @@
<pattern>jline</pattern>
<shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
</relocation>
@ -140,7 +145,7 @@ index def28b3bec..23f33d0477 100644
<relocation>
<pattern>org.apache.commons.codec</pattern>
<shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
@@ -248,10 +245,6 @@
@@ -258,10 +255,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>

14
Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
View File

@ -1,4 +1,4 @@
From 4f4068b7e3d12e9bd14bf1435449935da11ff9fb Mon Sep 17 00:00:00 2001
From 21423d201b654a7fb6843f94f98c659d9c1bdb54 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 02:10:36 -0400
Subject: [PATCH] Store reference to current Chunk for Entity and Block
@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
of having to look it up by hashmap lookups.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index c50fe1c24..061384b01 100644
index c50fe1c245..061384b012 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -29,7 +29,7 @@ public class Chunk implements IChunkAccess {
@ -89,7 +89,7 @@ index c50fe1c24..061384b01 100644
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7899fd6d8..2890e8121 100644
index 38227d85f4..fc878e28c9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -155,7 +155,7 @@ index 7899fd6d8..2890e8121 100644
private String entityKeyString;
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 9071bb7ec..820180ab3 100644
index 9071bb7ece..820180ab3f 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -51,6 +51,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@ -175,7 +175,7 @@ index 9071bb7ec..820180ab3 100644
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 63ecbcd47..c82c21326 100644
index 056525526e..5a047dd682 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -138,6 +138,7 @@ import net.minecraft.server.EntityZombieVillager;
@ -197,8 +197,8 @@ index 63ecbcd47..c82c21326 100644
+ }
+
public static CraftEntity getEntity(CraftServer server, Entity entity) {
/**
/*
* Order is *EXTREMELY* important -- keep it right! =D
--
2.26.0
2.26.2

46
Spigot-Server-Patches/0009-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From 91be85953d10fb5df264b2673005a2744f9140b3 Mon Sep 17 00:00:00 2001
From 32305966c8db9a70681fd5f858d6e738cab1e48b 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
@ -625,7 +625,7 @@ index 9eed98e379..d6646d7e61 100644
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2890e8121d..e9d0a4eb90 100644
index fc878e28c9..c75b74d558 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@ -664,7 +664,7 @@ index 2890e8121d..e9d0a4eb90 100644
protected BlockPosition ag() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1f350e3352..35e3f1c78d 100644
index 3ace8ee854..690c1ce0f6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -37,7 +37,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -676,7 +676,7 @@ index 1f350e3352..35e3f1c78d 100644
public abstract class EntityLiving extends Entity {
@@ -2262,7 +2262,6 @@ public abstract class EntityLiving extends Entity {
@@ -2265,7 +2265,6 @@ public abstract class EntityLiving extends Entity {
@Override
public void tick() {
@ -684,7 +684,7 @@ index 1f350e3352..35e3f1c78d 100644
super.tick();
this.o();
this.r();
@@ -2350,9 +2349,7 @@ public abstract class EntityLiving extends Entity {
@@ -2353,9 +2352,7 @@ public abstract class EntityLiving extends Entity {
}
}
@ -694,7 +694,7 @@ index 1f350e3352..35e3f1c78d 100644
double d0 = this.locX() - this.lastX;
double d1 = this.locZ() - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -2432,8 +2429,6 @@ public abstract class EntityLiving extends Entity {
@@ -2435,8 +2432,6 @@ public abstract class EntityLiving extends Entity {
if (this.isSleeping()) {
this.pitch = 0.0F;
}
@ -703,7 +703,7 @@ index 1f350e3352..35e3f1c78d 100644
}
protected float f(float f, float f1) {
@@ -2512,7 +2507,6 @@ public abstract class EntityLiving extends Entity {
@@ -2515,7 +2510,6 @@ public abstract class EntityLiving extends Entity {
this.setMot(d4, d5, d6);
this.world.getMethodProfiler().enter("ai");
@ -711,7 +711,7 @@ index 1f350e3352..35e3f1c78d 100644
if (this.isFrozen()) {
this.jumping = false;
this.aZ = 0.0F;
@@ -2522,7 +2516,6 @@ public abstract class EntityLiving extends Entity {
@@ -2525,7 +2519,6 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.getMethodProfiler().exit();
}
@ -719,7 +719,7 @@ index 1f350e3352..35e3f1c78d 100644
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("jump");
@@ -2546,9 +2539,7 @@ public abstract class EntityLiving extends Entity {
@@ -2549,9 +2542,7 @@ public abstract class EntityLiving extends Entity {
this.n();
AxisAlignedBB axisalignedbb = this.getBoundingBox();
@ -729,7 +729,7 @@ index 1f350e3352..35e3f1c78d 100644
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("push");
if (this.bn > 0) {
@@ -2556,9 +2547,7 @@ public abstract class EntityLiving extends Entity {
@@ -2559,9 +2550,7 @@ public abstract class EntityLiving extends Entity {
this.a(axisalignedbb, this.getBoundingBox());
}
@ -1405,7 +1405,7 @@ index 8a5ac6f69b..6810d49b17 100644
// CraftBukkit start - moved from MinecraftServer.saveChunks
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8d1f066f00..f3eacb1819 100644
index ad1dcf5304..1ceba5f7ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1973,12 +1973,31 @@ public final class CraftServer implements Server {
@ -1609,7 +1609,7 @@ index 2bd22a3698..0000000000
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 4fed5dc92f..d7a4e50f23 100644
index f20f72c035..ba6a924a9c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1718,6 +1718,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -1628,7 +1628,7 @@ index 4fed5dc92f..d7a4e50f23 100644
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index b90979c7ba..8823f94f7b 100644
index 9ad17c560c..db433ed370 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -1,5 +1,6 @@
@ -1638,16 +1638,16 @@ index b90979c7ba..8823f94f7b 100644
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.util.ArrayList;
import java.util.Comparator;
@@ -248,7 +249,7 @@ public class CraftScheduler implements BukkitScheduler {
}
@@ -254,7 +255,7 @@ public class CraftScheduler implements BukkitScheduler {
}
return false;
- }});
+ }}){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper
}
- });
+ }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper
handle(task, 0L);
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
@@ -283,7 +284,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -289,7 +290,7 @@ public class CraftScheduler implements BukkitScheduler {
}
}
}
@ -1656,7 +1656,7 @@ index b90979c7ba..8823f94f7b 100644
handle(task, 0L);
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
@@ -390,9 +391,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -396,9 +397,7 @@ public class CraftScheduler implements BukkitScheduler {
if (task.isSync()) {
currentTask = task;
try {
@ -1666,7 +1666,7 @@ index b90979c7ba..8823f94f7b 100644
} catch (final Throwable throwable) {
task.getOwner().getLogger().log(
Level.WARNING,
@@ -419,8 +418,10 @@ public class CraftScheduler implements BukkitScheduler {
@@ -425,8 +424,10 @@ public class CraftScheduler implements BukkitScheduler {
runners.remove(task.getTaskId());
}
}
@ -1677,7 +1677,7 @@ index b90979c7ba..8823f94f7b 100644
debugHead = debugHead.getNextHead(currentTick);
}
@@ -453,6 +454,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -459,6 +460,7 @@ public class CraftScheduler implements BukkitScheduler {
}
private void parsePending() {
@ -1685,8 +1685,8 @@ index b90979c7ba..8823f94f7b 100644
CraftTask head = this.head;
CraftTask task = head.getNext();
CraftTask lastTask = head;
@@ -471,6 +473,7 @@ public class CraftScheduler implements BukkitScheduler {
task.setNext(null);
@@ -477,6 +479,7 @@ public class CraftScheduler implements BukkitScheduler {
task.setNext(null);
}
this.head = lastTask;
+ MinecraftTimings.bukkitSchedulerPendingTimer.stopTiming();

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

@ -1,4 +1,4 @@
From ed104341e483f582e18953637c84f2c805fc5b3a Mon Sep 17 00:00:00 2001
From 498392154e1462cfd2d92bbc7f2c56ba23fc8972 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
@ -32,7 +32,7 @@ index 67bdd57747..e71ee0fb33 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f3eacb1819..99a6b3d443 100644
index 1ceba5f7ea..ee74986373 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -199,7 +199,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@ -45,11 +45,11 @@ index f3eacb1819..99a6b3d443 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 0d8668d34d..ba0fe4ae2c 100644
index b77593b51a..9806d77347 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -201,12 +201,25 @@ public class Main {
deadline.add(Calendar.DAY_OF_YEAR, -14);
@@ -200,12 +200,25 @@ public class Main {
deadline.add(Calendar.DAY_OF_YEAR, -21);
if (buildDate.before(deadline.getTime())) {
System.err.println("*** Error, this build is outdated ***");
- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");

10
Spigot-Server-Patches/0025-Entity-Origin-API.patch
View File

@ -1,11 +1,11 @@
From 9267e410b3666e372fb8f2a5bb534e903b401c89 Mon Sep 17 00:00:00 2001
From e52dfa5c34f0bc566133f8fcca7710103344caf6 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 7d4badd974..18236504e4 100644
index 9647d7850c..cf4901ccae 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -167,6 +167,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -117,10 +117,10 @@ index 6810d49b17..450b414298 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index c82c213260..a296936748 100644
index 5a047dd682..5625e5bda2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1007,4 +1007,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1009,4 +1009,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return spigot;
}
// Spigot end
@ -134,5 +134,5 @@ index c82c213260..a296936748 100644
+ // Paper end
}
--
2.25.1
2.26.2

10
Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
View File

@ -1,4 +1,4 @@
From 547ba9b126ab6998513ee8909dc9c4c71f97bfb7 Mon Sep 17 00:00:00 2001
From 01fa9f61451b0be80961d7c8a88080fa688bb798 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:46:17 -0600
Subject: [PATCH] Add configurable portal search radius
@ -21,10 +21,10 @@ index 62e793b71b..cd47a4ca06 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 826202f437..fd708f2f6c 100644
index 5e3959901b..5892d344ad 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2578,7 +2578,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2580,7 +2580,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
blockposition = new BlockPosition(d0, this.locY(), d1);
// CraftBukkit start
@ -34,7 +34,7 @@ index 826202f437..fd708f2f6c 100644
return null;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f0f456983f..b5101af011 100644
index 64635fe70f..540048627e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -755,7 +755,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -71,5 +71,5 @@ index 19c54f1dde..f84dd6d9be 100644
return villageplacetype == VillagePlaceType.u;
}, blockposition, searchRadius, VillagePlace.Occupancy.ANY).collect(Collectors.toList()); // CraftBukkit - searchRadius
--
2.25.1
2.26.2

10
Spigot-Server-Patches/0052-Add-velocity-warnings.patch
View File

@ -1,11 +1,11 @@
From e13cf3ad01cfb1f84b86fe970e8b4094a013da7e Mon Sep 17 00:00:00 2001
From 54551a9e6937621fd5cb7e26e89a03ebc43659b2 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:48:12 -0600
Subject: [PATCH] Add velocity warnings
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6107070b33..0cbf11aabb 100644
index 1cf8fd93a4..d5311eb017 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -234,6 +234,7 @@ public final class CraftServer implements Server {
@ -17,10 +17,10 @@ index 6107070b33..0cbf11aabb 100644
static {
ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index a296936748..bb07dec3c8 100644
index 5625e5bda2..1d02e9acb9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -407,10 +407,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -409,10 +409,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public void setVelocity(Vector velocity) {
Preconditions.checkArgument(velocity != null, "velocity");
velocity.checkFinite();
@ -88,5 +88,5 @@ index 73fa74e3cc..d961000611 100644
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
--
2.25.1
2.26.2

28
Spigot-Server-Patches/0054-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From 40a3ef84d5ce7daf39eb9cfb36cfd351c7c8d286 Mon Sep 17 00:00:00 2001
From 16efb56660977b7dd9e27997f7d1e10931c6680c 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
@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
new file mode 100644
index 000000000..f699ce18c
index 0000000000..f699ce18ca
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
@@ -0,0 +1,38 @@
@ -49,7 +49,7 @@ index 000000000..f699ce18c
+ }
+}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 14097d40d..ac11e214b 100644
index 56d740fcad..39e77f8248 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1,5 +1,6 @@
@ -80,7 +80,7 @@ index 14097d40d..ac11e214b 100644
}
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index a878f7c75..e5d89299f 100644
index 875f353dc3..fa4ad0b6dc 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -15,6 +15,9 @@ import java.util.function.BooleanSupplier;
@ -94,7 +94,7 @@ index a878f7c75..e5d89299f 100644
public class ChunkProviderServer extends IChunkProvider {
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
index c9c2b0025..1422503e1 100644
index c9c2b00251..1422503e11 100644
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
@@ -1,5 +1,6 @@
@ -121,7 +121,7 @@ index c9c2b0025..1422503e1 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 3dd72e084..291c2a17b 100644
index d49f456f73..a79e4cef4a 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -727,6 +727,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -141,7 +141,7 @@ index 3dd72e084..291c2a17b 100644
}
}
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
index 187c4e0f5..c2312a227 100644
index 187c4e0f58..c2312a227c 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -241,6 +241,7 @@ public class RegionFile implements AutoCloseable {
@ -161,7 +161,7 @@ index 187c4e0f5..c2312a227 100644
} finally {
if (filechannel != null) {
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 8ba344df6..02157d051 100644
index 8ba344df64..02157d051f 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -8,6 +8,7 @@ import org.apache.logging.log4j.LogManager;
@ -189,7 +189,7 @@ index 8ba344df6..02157d051 100644
}
diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
index d5e9bae70..1bcf01c09 100644
index d5e9bae709..1bcf01c09a 100644
--- a/src/main/java/net/minecraft/server/VillageSiege.java
+++ b/src/main/java/net/minecraft/server/VillageSiege.java
@@ -1,5 +1,7 @@
@ -209,7 +209,7 @@ index d5e9bae70..1bcf01c09 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6e8ac186c..a6b286709 100644
index 6e8ac186c9..a6b2867094 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2,6 +2,9 @@ package net.minecraft.server;
@ -248,7 +248,7 @@ index 6e8ac186c..a6b286709 100644
return;
// Paper end
diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
index 19e68a783..a2a25cf6a 100644
index 19e68a7831..a2a25cf6a4 100644
--- a/src/main/java/net/minecraft/server/WorldPersistentData.java
+++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
@@ -121,6 +121,7 @@ public class WorldPersistentData {
@ -260,7 +260,7 @@ index 19e68a783..a2a25cf6a 100644
} finally {
if (pushbackinputstream != null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 8823f94f7..552daf437 100644
index db433ed370..d05a9ae0fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger;
@ -273,7 +273,7 @@ index 8823f94f7..552daf437 100644
import org.apache.commons.lang.Validate;
import org.bukkit.plugin.IllegalPluginAccessException;
import org.bukkit.plugin.Plugin;
@@ -393,20 +396,26 @@ public class CraftScheduler implements BukkitScheduler {
@@ -399,20 +402,26 @@ public class CraftScheduler implements BukkitScheduler {
try {
task.run();
} catch (final Throwable throwable) {
@ -306,5 +306,5 @@ index 8823f94f7..552daf437 100644
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
--
2.26.0
2.26.2

10
Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch
View File

@ -1,4 +1,4 @@
From 1b8cce025dfa35eeca87658c030aa0ba39540b47 Mon Sep 17 00:00:00 2001
From cd94c4ddbd37ac8e966180469b4aa6f92454f2f4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 4 Mar 2013 23:46:10 -0500
Subject: [PATCH] Chunk Save Reattempt
@ -19,10 +19,10 @@ index c2312a227c..cee1ea8f43 100644
}
}
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index a7f19c8498..2fe27b460d 100644
index a164aee880..fd46da95e0 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -80,6 +80,7 @@ public final class RegionFileCache implements AutoCloseable {
@@ -85,6 +85,7 @@ public final class RegionFileCache implements AutoCloseable {
protected void write(ChunkCoordIntPair chunkcoordintpair, NBTTagCompound nbttagcompound) throws IOException {
RegionFile regionfile = this.getFile(chunkcoordintpair, false); // CraftBukkit
@ -30,7 +30,7 @@ index a7f19c8498..2fe27b460d 100644
DataOutputStream dataoutputstream = regionfile.c(chunkcoordintpair);
Throwable throwable = null;
@@ -103,6 +104,18 @@ public final class RegionFileCache implements AutoCloseable {
@@ -108,6 +109,18 @@ public final class RegionFileCache implements AutoCloseable {
}
@ -50,5 +50,5 @@ index a7f19c8498..2fe27b460d 100644
public void close() throws IOException {
--
2.25.1
2.26.2

10
Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch
View File

@ -1,14 +1,14 @@
From 00cb921766677cf40dca4350328219dbca421b0c Mon Sep 17 00:00:00 2001
From 71fb114207dc2bc7bdc49f6811e134adf3a31e12 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:07:20 -0400
Subject: [PATCH] Custom replacement for eaten items
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index cd9c49747d..1eca778d31 100644
index 591bf14a62..8d14e6aced 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2896,9 +2896,10 @@ public abstract class EntityLiving extends Entity {
@@ -2899,9 +2899,10 @@ public abstract class EntityLiving extends Entity {
this.b(this.activeItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@ -20,7 +20,7 @@ index cd9c49747d..1eca778d31 100644
world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -2913,9 +2914,20 @@ public abstract class EntityLiving extends Entity {
@@ -2916,9 +2917,20 @@ public abstract class EntityLiving extends Entity {
itemstack = this.activeItem.a(this.world, this);
}
@ -42,5 +42,5 @@ index cd9c49747d..1eca778d31 100644
}
--
2.25.1
2.26.2

10
Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View File

@ -1,11 +1,11 @@
From ed7477bde4156d57b763baa9c44bb186c4555f49 Mon Sep 17 00:00:00 2001
From 4758bc377177cf7072d1761f5c28f5c913d2f839 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1eca778d31..08d0728e16 100644
index 8d14e6aced..07c8f38f86 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -496,7 +496,13 @@ public abstract class EntityLiving extends Entity {
@ -34,7 +34,7 @@ index 1eca778d31..08d0728e16 100644
// CraftBukkit start - Handle scaled health
if (this instanceof EntityPlayer) {
org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
@@ -2739,7 +2749,7 @@ public abstract class EntityLiving extends Entity {
@@ -2742,7 +2752,7 @@ public abstract class EntityLiving extends Entity {
}
public void setAbsorptionHearts(float f) {
@ -44,7 +44,7 @@ index 1eca778d31..08d0728e16 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f2d820c399..f6b8bb6c7a 100644
index c4c3727850..9a92b96ff1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1549,6 +1549,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -56,5 +56,5 @@ index f2d820c399..f6b8bb6c7a 100644
}
--
2.25.1
2.26.2

10
Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch
View File

@ -1,11 +1,11 @@
From 7e305871b49b3145c819e600bc8f87c84f261389 Mon Sep 17 00:00:00 2001
From f899cd8bfbbdbf476382b7a1ef2ed4086002facb Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index b5101af011..d4bba876d0 100644
index 540048627e..aca885db36 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand;
@ -17,7 +17,7 @@ index b5101af011..d4bba876d0 100644
public PlayerConnection playerConnection;
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
@@ -1465,13 +1465,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1467,13 +1467,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
this.server.server.getPluginManager().callEvent(event);
}
@ -40,7 +40,7 @@ index b5101af011..d4bba876d0 100644
this.ci = packetplayinsettings.e();
this.getDataWatcher().set(EntityPlayer.bq, (byte) packetplayinsettings.f());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f668d86a9c..060a21840f 100644
index a392632a72..764a8ef952 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1733,8 +1733,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -65,5 +65,5 @@ index f668d86a9c..060a21840f 100644
{
Set<Player> ret = new HashSet<Player>();
--
2.25.1
2.26.2

8
Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch
View File

@ -1,4 +1,4 @@
From 91a6440e61188de08b45839276fe2fc71c774cb9 Mon Sep 17 00:00:00 2001
From a473c1fc4ba440d60d3c4931b99bc8e96cbf90c1 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 22 May 2016 20:20:55 -0500
Subject: [PATCH] Optional TNT doesn't move in water
@ -32,10 +32,10 @@ index 6db1312035..8cf3076f4e 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4fd0e54de7..7e552f985a 100644
index 7b295f4673..1aade318ef 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2717,6 +2717,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2719,6 +2719,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean bM() {
@ -107,5 +107,5 @@ index a13fd9b340..3ff7a7b4a8 100644
private java.util.Map<EntityPlayer, Boolean> trackedPlayerMap = null;
--
2.25.1
2.26.2

8
Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch
View File

@ -1,11 +1,11 @@
From 21af3ee89e421dacb95f08387f84cce82fc68e28 Mon Sep 17 00:00:00 2001
From d024183157b7d965c962d57f18a33172819ac7d7 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es>
Date: Wed, 23 Nov 2016 08:31:45 -0500
Subject: [PATCH] Cache user authenticator threads
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 222bb312..09dd7f06 100644
index 83ffee35fb..482d7b7cb6 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@ -50,7 +50,7 @@ index 222bb312..09dd7f06 100644
this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
}
@@ -1325,7 +1334,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1327,7 +1336,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.lastHealthSent = -1.0F;
this.lastFoodSent = -1;
// this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit
@ -67,5 +67,5 @@ index 222bb312..09dd7f06 100644
this.cr = entityplayer.cr;
this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch
View File

@ -1,4 +1,4 @@
From 52e1e31d7ee25cfe9bfc388429520919327bc64a Mon Sep 17 00:00:00 2001
From 3ed83061fe445107606b214a89065e6e891b90e8 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,10 +6,10 @@ 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 09dd7f06..95e09e35 100644
index 482d7b7cb6..bf32997c42 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1793,7 +1793,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1795,7 +1795,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
protected boolean isFrozen() {
@ -19,7 +19,7 @@ index 09dd7f06..95e09e35 100644
@Override
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5b304c04..f367a76e 100644
index 5b304c04bc..f367a76e82 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2526,7 +2526,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -32,5 +32,5 @@ index 5b304c04..f367a76e 100644
// CraftBukkit end
--
2.25.1.windows.1
2.26.2

38
Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
View File

@ -1,4 +1,4 @@
From 02c5588d0d0f678d2820893db36cefa7f04183db Mon Sep 17 00:00:00 2001
From 8d57e88e9ef41636970d0422e4f01566a7c06069 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:31:46 -0500
Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
Replaces isFromBottle() with logic that persists entity reloads too.
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 5de88137..5f261b9b 100644
index 5de881371a..5f261b9b92 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -511,13 +511,13 @@ public class Block implements IMaterial {
@ -28,7 +28,7 @@ index 5de88137..5f261b9b 100644
}
diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
index 2d2cd09a..ed88e208 100644
index 2d2cd09ad1..ed88e208d0 100644
--- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
+++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
@@ -81,7 +81,7 @@ public class ContainerGrindstone extends Container {
@ -41,7 +41,7 @@ index 2d2cd09a..ed88e208 100644
world.triggerEffect(1042, blockposition, 0);
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index 87625776..138e2ea5 100644
index 8762577696..138e2ea56a 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -616,7 +616,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@ -54,7 +54,7 @@ index 87625776..138e2ea5 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 0447800d..d4275e73 100644
index 0447800d9d..d4275e733d 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity {
@ -134,7 +134,7 @@ index 0447800d..d4275e73 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index 807ec339..73f5961a 100644
index 807ec3394d..73f5961aa3 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -401,7 +401,7 @@ public class EntityFishingHook extends Entity {
@ -147,7 +147,7 @@ index 807ec339..73f5961a 100644
// CraftBukkit end
if (itemstack1.getItem().a(TagsItem.FISHES)) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index dd1caec9..2775afc3 100644
index 56c8b56b06..306435c1c6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1379,7 +1379,8 @@ public abstract class EntityLiving extends Entity {
@ -161,7 +161,7 @@ index dd1caec9..2775afc3 100644
this.expToDrop = 0;
}
diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
index 0bfc0a77..ba2f90cc 100644
index 0bfc0a773d..ba2f90cc6a 100644
--- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
+++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
@@ -43,7 +43,7 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable {
@ -174,7 +174,7 @@ index 0bfc0a77..ba2f90cc 100644
this.die();
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
index c73cc9ae..76296119 100644
index c73cc9ae4b..76296119a1 100644
--- a/src/main/java/net/minecraft/server/EntityTurtle.java
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -510,7 +510,7 @@ public class EntityTurtle extends EntityAnimal {
@ -187,7 +187,7 @@ index c73cc9ae..76296119 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 5e383585..6ca4fa43 100644
index 5e3835851d..6ca4fa43c4 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -509,7 +509,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@ -200,7 +200,7 @@ index 5e383585..6ca4fa43 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
index 530c6999..2ad8dba5 100644
index 530c699964..2ad8dba5c0 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
@@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@ -213,7 +213,7 @@ index 530c6999..2ad8dba5 100644
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
index 1ab2668e..2b708761 100644
index 1ab2668e91..2b708761d0 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
@@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@ -226,7 +226,7 @@ index 1ab2668e..2b708761 100644
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index f6c6ea4a..dff3eb11 100644
index f6c6ea4aaf..dff3eb1188 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -374,7 +374,7 @@ public class PlayerInteractManager {
@ -239,7 +239,7 @@ index f6c6ea4a..dff3eb11 100644
return true;
diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
index d2698e84..edc4a5c3 100644
index d2698e847c..edc4a5c34e 100644
--- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
+++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
@@ -2,7 +2,7 @@ package net.minecraft.server;
@ -252,7 +252,7 @@ index d2698e84..edc4a5c3 100644
public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) {
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
index 8dc47452..560e2f42 100644
index 8dc47452a4..560e2f42b7 100644
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@ -265,10 +265,10 @@ index 8dc47452..560e2f42 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c06b10c6..d3df3f59 100644
index 342cf7be8a..e66c97ba9c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1795,7 +1795,7 @@ public class CraftWorld implements World {
@@ -1801,7 +1801,7 @@ public class CraftWorld implements World {
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {
entity = new EntityTNTPrimed(world, x, y, z, null);
} else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
@ -278,7 +278,7 @@ index c06b10c6..d3df3f59 100644
entity = new EntityLightning(world, x, y, z, false);
} else if (Firework.class.isAssignableFrom(clazz)) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
index 1b512cc4..fbad0456 100644
index 1b512cc45c..fbad045675 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
@@ -20,6 +20,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@ -301,5 +301,5 @@ index 1b512cc4..fbad0456 100644
public EntityExperienceOrb getHandle() {
return (EntityExperienceOrb) entity;
--
2.25.1.windows.1
2.26.2

12
Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
View File

@ -1,4 +1,4 @@
From 6f567dd6ea759b3af52c4ec8096ea256858ba361 Mon Sep 17 00:00:00 2001
From b22dd2c697e51dfe9dfc7e94eab83868025cc088 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 22 Jan 2017 18:07:56 -0500
Subject: [PATCH] Cap Entity Collisions
@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
You can set this to 0 to disable collisions.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index f164844f..751551f1 100644
index f164844f33..751551f173 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -322,4 +322,10 @@ public class PaperWorldConfig {
@ -27,7 +27,7 @@ index f164844f..751551f1 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1c8958d1..4f8e10b8 100644
index 3b02a65ba2..0d7dcc1463 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -39,10 +39,10 @@ index 1c8958d1..4f8e10b8 100644
// Spigot end
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 2775afc3..74de19bb 100644
index 306435c1c6..639d113de3 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2623,8 +2623,11 @@ public abstract class EntityLiving extends Entity {
@@ -2626,8 +2626,11 @@ public abstract class EntityLiving extends Entity {
}
}
@ -56,5 +56,5 @@ index 2775afc3..74de19bb 100644
this.C(entity);
}
--
2.25.1.windows.1
2.26.2

12
Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch
View File

@ -1,4 +1,4 @@
From a99a62d07c1769b1d7b36d76a0ece98e1bf61f67 Mon Sep 17 00:00:00 2001
From fafb25d0ff1ed933e8e50cd37e1f4923cc3f6814 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 5 Feb 2017 00:04:04 -0500
Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@ -9,10 +9,10 @@ One report of a suspected memory leak with the system.
This adds additional overhead to asynchronous task dispatching
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 552daf43..e102be58 100644
index d05a9ae0fb..8c48130db0 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -420,7 +420,7 @@ public class CraftScheduler implements BukkitScheduler {
}
parsePending();
} else {
@ -21,7 +21,7 @@ index 552daf43..e102be58 100644
executor.execute(new ServerSchedulerReportingWrapper(task)); // Paper
// We don't need to parse pending
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
@@ -431,7 +431,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -437,7 +437,7 @@ public class CraftScheduler implements BukkitScheduler {
pending.addAll(temp);
temp.clear();
MinecraftTimings.bukkitSchedulerFinishTimer.stopTiming();
@ -30,7 +30,7 @@ index 552daf43..e102be58 100644
}
private void addTask(final CraftTask task) {
@@ -491,10 +491,15 @@ public class CraftScheduler implements BukkitScheduler {
@@ -497,10 +497,15 @@ public class CraftScheduler implements BukkitScheduler {
@Override
public String toString() {
@ -47,5 +47,5 @@ index 552daf43..e102be58 100644
@Deprecated
--
2.25.1.windows.1
2.26.2

14
Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch
View File

@ -1,4 +1,4 @@
From 29ffd496d5b85c2626fdacb8d144824f45275241 Mon Sep 17 00:00:00 2001
From 4d1980ff48ce53c1f17343466879bd18228f749a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 13 May 2017 20:11:21 -0500
Subject: [PATCH] Add system property to disable book size limits
@ -11,10 +11,10 @@ to make books with as much data as they want. Do not use this without
limiting incoming data from packets in some other way.
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index 08f3a315..6ddb1335 100644
index bf17acbafd..e3adcc0c72 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -35,6 +35,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
static final int MAX_PAGES = 100;
static final int MAX_PAGE_LENGTH = 320; // 256 limit + 64 characters to allow for psuedo colour codes
static final int MAX_TITLE_LENGTH = 32;
@ -22,7 +22,7 @@ index 08f3a315..6ddb1335 100644
protected String title;
protected String author;
@@ -198,7 +199,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -197,7 +198,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
if (title == null) {
this.title = null;
return true;
@ -31,7 +31,7 @@ index 08f3a315..6ddb1335 100644
return false;
}
@@ -238,7 +239,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -237,7 +238,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
throw new IllegalArgumentException("Invalid page number " + page + "/" + pages.size());
}
@ -40,7 +40,7 @@ index 08f3a315..6ddb1335 100644
pages.set(page - 1, CraftChatMessage.fromString(newText, true)[0]);
}
@@ -252,13 +253,13 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -251,13 +252,13 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@Override
public void addPage(final String... pages) {
for (String page : pages) {
@ -57,5 +57,5 @@ index 08f3a315..6ddb1335 100644
}
--
2.25.1.windows.1
2.26.2

206
Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -1,4 +1,4 @@
From 1c57cf609900d050035f40a897d442f171803efa Mon Sep 17 00:00:00 2001
From 59e4449df98724b0bfcbad09b02ebbb6ef4a2b36 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 9 Jun 2017 19:03:43 +0200
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -19,10 +19,10 @@ Other changes:
configuration
diff --git a/pom.xml b/pom.xml
index 23f33d0477..dea7bc2619 100644
index 6cc18aa360..01dcaf4f4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,10 +47,27 @@
@@ -44,10 +44,27 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -54,11 +54,11 @@ index 23f33d0477..dea7bc2619 100644
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
@@ -236,10 +253,18 @@
@@ -246,10 +263,18 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/java.sql.Driver</resource>
</transformer>
+ <transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer" />
+ <transformer implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer" />
</transformers>
</configuration>
</execution>
@ -67,7 +67,7 @@ index 23f33d0477..dea7bc2619 100644
+ <dependency>
+ <groupId>com.github.edwgiz</groupId>
+ <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
+ <version>2.8.1</version>
+ <version>2.13.1</version>
+ </dependency>
+ </dependencies>
</plugin>
@ -258,18 +258,19 @@ index 56266a7729..77f1ddc8a8 100644
this.k = new GameProfileBanList(PlayerList.b);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2e0f443d9f..742c21480a 100644
index 9eb4acf93c..681a84e5b3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -42,7 +42,6 @@ import java.util.logging.Level;
@@ -42,7 +42,7 @@ import java.util.function.Consumer;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.imageio.ImageIO;
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
-import jline.console.ConsoleReader;
+//import jline.console.ConsoleReader; // Paper
import net.minecraft.server.Advancement;
import net.minecraft.server.ArgumentEntity;
import net.minecraft.server.Block;
@@ -1118,9 +1117,13 @@ public final class CraftServer implements Server {
@@ -1118,9 +1118,13 @@ public final class CraftServer implements Server {
return logger;
}
@ -284,7 +285,7 @@ index 2e0f443d9f..742c21480a 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 93fcfd5f39..0e76e34664 100644
index f9d07e5ca7..9fdad34bb8 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -13,7 +13,7 @@ import java.util.logging.Logger;
@ -303,14 +304,14 @@ index 93fcfd5f39..0e76e34664 100644
+ // Paper start - Handled by TerminalConsoleAppender
+ /*
// This trick bypasses Maven Shade's clever rewriting of our getProperty call when using String literals
String jline_UnsupportedTerminal = new String(new char[] {'j','l','i','n','e','.','U','n','s','u','p','p','o','r','t','e','d','T','e','r','m','i','n','a','l'});
String jline_terminal = new String(new char[] {'j','l','i','n','e','.','t','e','r','m','i','n','a','l'});
@@ -196,10 +198,18 @@ public class Main {
String jline_UnsupportedTerminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 'U', 'n', 's', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
String jline_terminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
@@ -196,9 +198,18 @@ public class Main {
// This ensures the terminal literal will always match the jline implementation
System.setProperty(jline.TerminalFactory.JLINE_TERMINAL, jline.UnsupportedTerminal.class.getName());
}
+ */
+
+ if (options.has("nojline")) {
+ System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false");
+ useJline = false;
@ -324,7 +325,7 @@ index 93fcfd5f39..0e76e34664 100644
}
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
@@ -227,7 +237,7 @@ public class Main {
@@ -226,7 +237,7 @@ public class Main {
System.out.println("Unable to read system info");
}
// Paper end
@ -334,83 +335,36 @@ index 93fcfd5f39..0e76e34664 100644
MinecraftServer.main(options);
} catch (Throwable t) {
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 fdf2f075e2..0000000000
index e0bd5adc19..aae615c13b 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bukkit.craftbukkit.command;
-
-import java.util.EnumMap;
-import java.util.Map;
+++ b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
@@ -2,15 +2,15 @@ package org.bukkit.craftbukkit.command;
import java.util.EnumMap;
import java.util.Map;
-import jline.Terminal;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.craftbukkit.CraftServer;
+//import jline.Terminal;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.craftbukkit.CraftServer;
-import org.fusesource.jansi.Ansi;
-import org.fusesource.jansi.Ansi.Attribute;
-
+//import org.fusesource.jansi.Ansi;
+//import org.fusesource.jansi.Ansi.Attribute;
-public class ColouredConsoleSender extends CraftConsoleCommandSender {
- private final Terminal terminal;
- private final Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class);
- private final ChatColor[] colors = ChatColor.values();
-
- protected ColouredConsoleSender() {
- super();
- this.terminal = ((CraftServer) getServer()).getReader().getTerminal();
-
- replacements.put(ChatColor.BLACK, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLACK).boldOff().toString());
- replacements.put(ChatColor.DARK_BLUE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLUE).boldOff().toString());
- replacements.put(ChatColor.DARK_GREEN, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.GREEN).boldOff().toString());
- replacements.put(ChatColor.DARK_AQUA, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.CYAN).boldOff().toString());
- replacements.put(ChatColor.DARK_RED, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.RED).boldOff().toString());
- replacements.put(ChatColor.DARK_PURPLE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.MAGENTA).boldOff().toString());
- replacements.put(ChatColor.GOLD, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.YELLOW).boldOff().toString());
- replacements.put(ChatColor.GRAY, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.WHITE).boldOff().toString());
- replacements.put(ChatColor.DARK_GRAY, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLACK).bold().toString());
- replacements.put(ChatColor.BLUE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLUE).bold().toString());
- replacements.put(ChatColor.GREEN, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.GREEN).bold().toString());
- replacements.put(ChatColor.AQUA, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.CYAN).bold().toString());
- replacements.put(ChatColor.RED, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.RED).bold().toString());
- replacements.put(ChatColor.LIGHT_PURPLE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.MAGENTA).bold().toString());
- replacements.put(ChatColor.YELLOW, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.YELLOW).bold().toString());
- replacements.put(ChatColor.WHITE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.WHITE).bold().toString());
- replacements.put(ChatColor.MAGIC, Ansi.ansi().a(Attribute.BLINK_SLOW).toString());
- replacements.put(ChatColor.BOLD, Ansi.ansi().a(Attribute.UNDERLINE_DOUBLE).toString());
- replacements.put(ChatColor.STRIKETHROUGH, Ansi.ansi().a(Attribute.STRIKETHROUGH_ON).toString());
- replacements.put(ChatColor.UNDERLINE, Ansi.ansi().a(Attribute.UNDERLINE).toString());
- replacements.put(ChatColor.ITALIC, Ansi.ansi().a(Attribute.ITALIC).toString());
- replacements.put(ChatColor.RESET, Ansi.ansi().a(Attribute.RESET).toString());
+public class ColouredConsoleSender /*extends CraftConsoleCommandSender */{/* // Paper - disable
private final Terminal terminal;
private final Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class);
private final ChatColor[] colors = ChatColor.values();
@@ -71,5 +71,5 @@ public class ColouredConsoleSender extends CraftConsoleCommandSender {
} else {
return new ColouredConsoleSender();
}
- }
-
- @Override
- public void sendMessage(String message) {
- if (terminal.isAnsiSupported()) {
- if (!conversationTracker.isConversingModaly()) {
- String result = message;
- for (ChatColor color : colors) {
- if (replacements.containsKey(color)) {
- result = result.replaceAll("(?i)" + color.toString(), replacements.get(color));
- } else {
- result = result.replaceAll("(?i)" + color.toString(), "");
- }
- }
- System.out.println(result + Ansi.ansi().reset().toString());
- }
- } else {
- super.sendMessage(message);
- }
- }
-
- public static ConsoleCommandSender getInstance() {
- if (Bukkit.getConsoleSender() != null) {
- return Bukkit.getConsoleSender();
- } else {
- return new ColouredConsoleSender();
- }
- }
-}
+ }*/ // Paper
}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
index befcc19f9b..5510266fb1 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
@ -508,69 +462,33 @@ index 70f8d42992..449e99d1b6 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
deleted file mode 100644
index 99564fed7c..0000000000
index 99564fed7c..9a2da548b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bukkit.craftbukkit.util;
-
-import com.mojang.util.QueueLogAppender;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+++ b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
@@ -5,12 +5,12 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.logging.Level;
import java.util.logging.Logger;
-import jline.console.ConsoleReader;
-import org.bukkit.craftbukkit.Main;
+//import jline.console.ConsoleReader;
import org.bukkit.craftbukkit.Main;
-import org.fusesource.jansi.Ansi;
-import org.fusesource.jansi.Ansi.Erase;
-
+//import org.fusesource.jansi.Ansi;
+//import org.fusesource.jansi.Ansi.Erase;
-public class TerminalConsoleWriterThread extends Thread {
- private final ConsoleReader reader;
- private final OutputStream output;
-
- public TerminalConsoleWriterThread(OutputStream output, ConsoleReader reader) {
- super("TerminalConsoleWriter");
- this.output = output;
- this.reader = reader;
-
- this.setDaemon(true);
+public class TerminalConsoleWriterThread /*extends Thread*/ {/* // Paper - disable
private final ConsoleReader reader;
private final OutputStream output;
@@ -54,5 +54,5 @@ public class TerminalConsoleWriterThread extends Thread {
Logger.getLogger(TerminalConsoleWriterThread.class.getName()).log(Level.SEVERE, null, ex);
}
}
- }
-
- @Override
- public void run() {
- String message;
-
- // Using name from log4j config in vanilla jar
- while (true) {
- message = QueueLogAppender.getNextLogEvent("TerminalConsole");
- if (message == null) {
- continue;
- }
-
- try {
- if (Main.useJline) {
- reader.print(Ansi.ansi().eraseLine(Erase.ALL).toString() + ConsoleReader.RESET_LINE);
- reader.flush();
- output.write(message.getBytes());
- output.flush();
-
- try {
- reader.drawLine();
- } catch (Throwable ex) {
- reader.getCursorBuffer().clear();
- }
- reader.flush();
- } else {
- output.write(message.getBytes());
- output.flush();
- }
- } catch (IOException ex) {
- Logger.getLogger(TerminalConsoleWriterThread.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
- }
-}
+ }*/
}
diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
new file mode 100644
index 0000000000..0694b21465

12
Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch
View File

@ -1,14 +1,14 @@
From 5b773eb30327f0bf80b195dda85dec7045867fb8 Mon Sep 17 00:00:00 2001
From 02ec89d2d15e4e57f767626534ee34b0eb6364cf Mon Sep 17 00:00:00 2001
From: Sweepyoface <github@sweepy.pw>
Date: Sat, 17 Jun 2017 18:48:21 -0400
Subject: [PATCH] Add UnknownCommandEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 742c2148..1f1af567 100644
index 681a84e5b3..f01bd38d0b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -79,6 +79,7 @@ import net.minecraft.server.WorldServer;
@@ -80,6 +80,7 @@ import net.minecraft.server.WorldServer;
import net.minecraft.server.WorldSettings;
import net.minecraft.server.WorldType;
import org.apache.commons.lang.Validate;
@ -16,7 +16,7 @@ index 742c2148..1f1af567 100644
import org.bukkit.BanList;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -150,6 +151,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -151,6 +152,7 @@ import org.bukkit.craftbukkit.util.Versioning;
import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
@ -24,7 +24,7 @@ index 742c2148..1f1af567 100644
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
import org.bukkit.event.server.BroadcastMessageEvent;
@@ -750,7 +752,13 @@ public final class CraftServer implements Server {
@@ -751,7 +753,13 @@ public final class CraftServer implements Server {
// Spigot start
if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
@ -40,5 +40,5 @@ index 742c2148..1f1af567 100644
// Spigot end
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
View File

@ -1,4 +1,4 @@
From 8a6737ec1d8a570f928e92e023d0edb85c27cc0a Mon Sep 17 00:00:00 2001
From cfa64dcb818cf795dc01a6286ad2d361486a00a0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 15 Jan 2018 22:11:48 -0500
Subject: [PATCH] Basic PlayerProfile API
@ -486,10 +486,10 @@ index 581199e6dc..a072222bc5 100644
private UserCacheEntry(GameProfile gameprofile, Date date) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1f1af567b4..8d23eb0e7b 100644
index f01bd38d0b..95f4abddf5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -199,6 +199,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -200,6 +200,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
@ -499,7 +499,7 @@ index 1f1af567b4..8d23eb0e7b 100644
public final class CraftServer implements Server {
private final String serverName = "Paper"; // Paper
private final String serverVersion;
@@ -2153,5 +2156,24 @@ public final class CraftServer implements Server {
@@ -2154,5 +2157,24 @@ public final class CraftServer implements Server {
public boolean suggestPlayerNamesWhenNullTabCompletions() {
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
}

10
Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch
View File

@ -1,11 +1,11 @@
From 038221a7da315491055d2512213c6d8b4355cf0c Mon Sep 17 00:00:00 2001
From 97246173932ca34fa3a1dd5e095f05988ddbe7a6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 15:18:30 -0400
Subject: [PATCH] Shoulder Entities Release API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 5e92f0dd..3bd5ddba 100644
index ad79e4521c..8e5edd2c9b 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1901,20 +1901,44 @@ public abstract class EntityHuman extends EntityLiving {
@ -58,10 +58,10 @@ index 5e92f0dd..3bd5ddba 100644
@Override
public abstract boolean isSpectator();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 77ee3c29..ce84885a 100644
index 2c20a7b924..191bb7345e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -513,6 +513,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -518,6 +518,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
getHandle().getCooldownTracker().setCooldown(CraftMagicNumbers.getItem(material), ticks);
}
@ -95,5 +95,5 @@ index 77ee3c29..ce84885a 100644
public boolean discoverRecipe(NamespacedKey recipe) {
return discoverRecipes(Arrays.asList(recipe)) != 0;
--
2.25.1.windows.1
2.26.2

12
Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch
View File

@ -1,11 +1,11 @@
From 1c3787786da26275536db40457f0f9693a0813fd Mon Sep 17 00:00:00 2001
From 3b9143d900914d380349848ae519a4386a73a35f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4f8e10b8..1de1a10c 100644
index 0d7dcc1463..153bfd07fa 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -37,7 +37,7 @@ index 4f8e10b8..1de1a10c 100644
} catch (Throwable throwable) {
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index b249af20..ab5d83d3 100644
index b249af20c4..ab5d83d34d 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -140,6 +140,7 @@ public abstract class MobSpawnerAbstract {
@ -49,10 +49,10 @@ index b249af20..ab5d83d3 100644
if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
Entity vehicle = entity.getVehicle();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index bb07dec3..495a7c46 100644
index 1d02e9acb9..440bc4513b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1045,5 +1045,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1047,5 +1047,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
Location origin = getHandle().origin;
return origin == null ? null : origin.clone();
}
@ -64,5 +64,5 @@ index bb07dec3..495a7c46 100644
// Paper end
}
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch
View File

@ -1,4 +1,4 @@
From e772f359fd89943ec103233db8479e790d5e4689 Mon Sep 17 00:00:00 2001
From 034e99d1be1c8b2df3db3f7a384666660c369d49 Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Sun, 6 Aug 2017 17:17:53 -0500
Subject: [PATCH] Fix this stupid bullshit
@ -9,12 +9,12 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
and to provide some level of hint without being disruptive.
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 0e76e346..444a6a60 100644
index 9fdad34bb8..d1bdac6aa9 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -218,10 +218,12 @@ public class Main {
Calendar deadline = Calendar.getInstance();
deadline.add(Calendar.DAY_OF_YEAR, -14);
deadline.add(Calendar.DAY_OF_YEAR, -21);
if (buildDate.before(deadline.getTime())) {
- System.err.println("*** Error, this build is outdated ***");
+ // Paper start - This is some stupid bullshit
@ -29,5 +29,5 @@ index 0e76e346..444a6a60 100644
}
--
2.25.1.windows.1
2.26.2

6
Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
View File

@ -1,4 +1,4 @@
From 5f12e07474ebfc007a3a8fddca90e4e076127efa Mon Sep 17 00:00:00 2001
From 6458b9b642b78110256e30abe5116a5353a36180 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Mon, 18 Sep 2017 12:00:03 +0200
Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@ -12,10 +12,10 @@ results in a separate line, even though it should not result in
a line break. Log4j's implementation handles it correctly.
diff --git a/pom.xml b/pom.xml
index dea7bc2619..24cdeb6ff4 100644
index 01dcaf4f4b..f4fbd5c016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,11 @@
@@ -66,6 +66,11 @@
<version>2.8.1</version>
<scope>runtime</scope>
</dependency>

6
Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch
View File

@ -1,4 +1,4 @@
From c564d96c0c02a902a986e9a512da7dc5a2b25628 Mon Sep 17 00:00:00 2001
From dcdf6b883c4f897b2fffee1863dab10a55e65917 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:14:55 +0200
Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@ -15,10 +15,10 @@ This may cause additional prefixes to be disabled for plugins bypassing
the plugin logger.
diff --git a/pom.xml b/pom.xml
index 24cdeb6ff4..ab8c61ab53 100644
index f4fbd5c016..4585ee5bea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
@@ -64,7 +64,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.8.1</version>

6
Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch
View File

@ -1,14 +1,14 @@
From 9e21ba071cd08c5232b4352237d05eec746746f8 Mon Sep 17 00:00:00 2001
From 139fbd578f28f4442884652552af30d1791f5c95 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:33:35 +0200
Subject: [PATCH] Include Log4J2 SLF4J implementation
diff --git a/pom.xml b/pom.xml
index ab8c61ab53..76ce7f4486 100644
index 4585ee5bea..6fe4eff84b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,12 @@
@@ -66,6 +66,12 @@
<version>2.8.1</version>
<scope>compile</scope>
</dependency>

10
Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch
View File

@ -1,11 +1,11 @@
From ac291d00f151d73d3d718328ed97714ece0a4de8 Mon Sep 17 00:00:00 2001
From 09850a2d79e1345efaa78b0fff440d62f82901fd Mon Sep 17 00:00:00 2001
From: pkt77 <parkerkt77@gmail.com>
Date: Fri, 10 Nov 2017 23:46:34 -0500
Subject: [PATCH] Add PlayerArmorChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c7b62872..fe0b0822 100644
index 88688be668..c5c0fc3877 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1,5 +1,6 @@
@ -15,7 +15,7 @@ index c7b62872..fe0b0822 100644
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -2336,6 +2337,13 @@ public abstract class EntityLiving extends Entity {
@@ -2339,6 +2340,13 @@ public abstract class EntityLiving extends Entity {
ItemStack itemstack1 = this.getEquipment(enumitemslot);
if (!ItemStack.matches(itemstack1, itemstack)) {
@ -30,7 +30,7 @@ index c7b62872..fe0b0822 100644
if (!itemstack.isEmpty()) {
this.getAttributeMap().a(itemstack.a(enumitemslot));
diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
index 02a7ae67..60b235f1 100644
index 02a7ae6785..60b235f16f 100644
--- a/src/main/java/net/minecraft/server/EnumItemSlot.java
+++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
@@ -16,6 +16,7 @@ public enum EnumItemSlot {
@ -42,5 +42,5 @@ index 02a7ae67..60b235f1 100644
return this.g;
}
--
2.25.1.windows.1
2.26.2

14
Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch
View File

@ -1,4 +1,4 @@
From e1c64c1bb29a3243a08d22459101f338e858ee41 Mon Sep 17 00:00:00 2001
From 3cfddc0dc9746e8c19ad37daee39019f1216bb11 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 6 Nov 2017 21:08:22 -0500
Subject: [PATCH] API to get a BlockState without a snapshot
@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
If Tile Entity was null, correct Sign to return empty lines instead of null
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 630b2791..95827924 100644
index 630b279158..958279249f 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@ -39,10 +39,10 @@ index 630b2791..95827924 100644
return null;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index eb0201eb..1354d949 100644
index 5c1c4d5837..ef81c1d3a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -311,6 +311,20 @@ public class CraftBlock implements Block {
@@ -308,6 +308,20 @@ public class CraftBlock implements Block {
@Override
public BlockState getState() {
@ -64,7 +64,7 @@ index eb0201eb..1354d949 100644
switch (material) {
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
index 17d80b5c..f6401e2c 100644
index 17d80b5c6e..f6401e2cde 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -26,20 +26,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@ -114,7 +114,7 @@ index 17d80b5c..f6401e2c 100644
private T createSnapshot(T tileEntity) {
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
index 15022ada..af15656c 100644
index 15022ada0c..af15656cc4 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
@@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
@ -131,5 +131,5 @@ index 15022ada..af15656c 100644
@Override
--
2.25.1.windows.1
2.26.2

12
Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch
View File

@ -1,4 +1,4 @@
From a21a5ec7909615a49eccd6c6445cc5f16c01df44 Mon Sep 17 00:00:00 2001
From 980b864d8aec2d37748ca463cd4b599026129f6d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 26 Nov 2017 13:19:58 -0500
Subject: [PATCH] AsyncTabCompleteEvent
@ -14,7 +14,7 @@ completion, such as offline players.
Also adds isCommand and getLocation to the sync TabCompleteEvent
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2a3771d0..64f789d7 100644
index 2a3771d065..64f789d7c4 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -524,10 +524,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -72,10 +72,10 @@ index 2a3771d0..64f789d7 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8d23eb0e..b7eaa0fe 100644
index 95f4abddf5..3697b3298f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1709,7 +1709,7 @@ public final class CraftServer implements Server {
@@ -1710,7 +1710,7 @@ public final class CraftServer implements Server {
offers = tabCompleteChat(player, message);
}
@ -85,7 +85,7 @@ index 8d23eb0e..b7eaa0fe 100644
return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
index 5510266f..a51202ed 100644
index 5510266fb1..a51202ed53 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
@@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
@ -129,5 +129,5 @@ index 5510266f..a51202ed 100644
Waitable<List<String>> waitable = new Waitable<List<String>>() {
@Override
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch
View File

@ -1,4 +1,4 @@
From 876ea6519418b03a17dc24683e90c2d4d655d406 Mon Sep 17 00:00:00 2001
From 34f347266adf2b086b4ab7c2e8572c0818640596 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 24 Feb 2018 01:14:55 -0500
Subject: [PATCH] Tameable#getOwnerUniqueId API
@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
an OfflinePlayer to be loaded from disk.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
index 9952db3e..1aea5f3f 100644
index 9952db3eb5..1aea5f3f05 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
@@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@ -21,11 +21,11 @@ index 9952db3e..1aea5f3f 100644
return getHandle().getOwnerUUID();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
index 5dfa40dd..407b95ca 100644
index bff9854f30..286d1194f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
@@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
return (EntityTameableAnimal)super.getHandle();
return (EntityTameableAnimal) super.getHandle();
}
+ public UUID getOwnerUniqueId() {
@ -35,5 +35,5 @@ index 5dfa40dd..407b95ca 100644
try {
return getHandle().getOwnerUUID();
--
2.25.1.windows.1
2.26.2

56
Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch
View File

@ -1,4 +1,4 @@
From bc4eaad7021910497a2282fb7aadf0e11122e7dd Mon Sep 17 00:00:00 2001
From 9b37c9fbd0cf1c9ef80400eae55378c25800e4b8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 16 Mar 2018 22:59:43 -0400
Subject: [PATCH] Improved Async Task Scheduler
@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
new file mode 100644
index 00000000..3c1992e2
index 0000000000..3c1992e212
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
@@ -0,0 +1,122 @@
@ -159,7 +159,7 @@ index 00000000..3c1992e2
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index e102be58..5db848de 100644
index 8c48130db0..b116a41595 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler {
@ -171,7 +171,7 @@ index e102be58..5db848de 100644
new Comparator<CraftTask>() {
@Override
public int compare(final CraftTask o1, final CraftTask o2) {
@@ -79,21 +79,38 @@ public class CraftScheduler implements BukkitScheduler {
@@ -79,12 +79,13 @@ public class CraftScheduler implements BukkitScheduler {
/**
* These are tasks that are currently active. It's provided for 'viewing' the current state.
*/
@ -182,13 +182,17 @@ index e102be58..5db848de 100644
*/
private volatile CraftTask currentTask = null;
- private volatile int currentTick = -1;
- private final Executor executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setNameFormat("Craft Scheduler Thread - %d").build());
- private CraftAsyncDebugger debugHead = new CraftAsyncDebugger(-1, null, null) {@Override StringBuilder debugTo(StringBuilder string) {return string;}};
- private CraftAsyncDebugger debugTail = debugHead;
+ volatile int currentTick = -1; // Paper
+ //private final Executor executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setNameFormat("Craft Scheduler Thread - %d").build()); // Paper - moved to AsyncScheduler
+ //private CraftAsyncDebugger debugHead = new CraftAsyncDebugger(-1, null, null) {@Override StringBuilder debugTo(StringBuilder string) {return string;}}; // Paper
+ //private CraftAsyncDebugger debugTail = debugHead; // Paper
+ // Paper start - Improved Async Task Scheduler
+ volatile int currentTick = -1;/*
private final Executor executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setNameFormat("Craft Scheduler Thread - %d").build());
private CraftAsyncDebugger debugHead = new CraftAsyncDebugger(-1, null, null) {
@Override
@@ -93,12 +94,31 @@ public class CraftScheduler implements BukkitScheduler {
}
};
private CraftAsyncDebugger debugTail = debugHead;
+
+ */ // Paper end
private static final int RECENT_TICKS;
static {
@ -215,7 +219,7 @@ index e102be58..5db848de 100644
@Override
public int scheduleSyncDelayedTask(final Plugin plugin, final Runnable task) {
return this.scheduleSyncDelayedTask(plugin, task, 0L);
@@ -210,7 +227,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -215,7 +235,7 @@ public class CraftScheduler implements BukkitScheduler {
} else if (period < CraftTask.NO_REPEATING) {
period = CraftTask.NO_REPEATING;
}
@ -224,7 +228,7 @@ index e102be58..5db848de 100644
}
@Override
@@ -226,6 +243,11 @@ public class CraftScheduler implements BukkitScheduler {
@@ -231,6 +251,11 @@ public class CraftScheduler implements BukkitScheduler {
if (taskId <= 0) {
return;
}
@ -236,7 +240,7 @@ index e102be58..5db848de 100644
CraftTask task = runners.get(taskId);
if (task != null) {
task.cancel0();
@@ -267,6 +289,11 @@ public class CraftScheduler implements BukkitScheduler {
@@ -273,6 +298,11 @@ public class CraftScheduler implements BukkitScheduler {
@Override
public void cancelTasks(final Plugin plugin) {
Validate.notNull(plugin, "Cannot cancel tasks of null plugin");
@ -248,7 +252,7 @@ index e102be58..5db848de 100644
final CraftTask task = new CraftTask(
new Runnable() {
@Override
@@ -306,6 +333,13 @@ public class CraftScheduler implements BukkitScheduler {
@@ -312,6 +342,13 @@ public class CraftScheduler implements BukkitScheduler {
@Override
public boolean isCurrentlyRunning(final int taskId) {
@ -262,7 +266,7 @@ index e102be58..5db848de 100644
final CraftTask task = runners.get(taskId);
if (task == null) {
return false;
@@ -324,6 +358,11 @@ public class CraftScheduler implements BukkitScheduler {
@@ -330,6 +367,11 @@ public class CraftScheduler implements BukkitScheduler {
if (taskId <= 0) {
return false;
}
@ -274,7 +278,7 @@ index e102be58..5db848de 100644
for (CraftTask task = head.getNext(); task != null; task = task.getNext()) {
if (task.getTaskId() == taskId) {
return task.getPeriod() >= CraftTask.NO_REPEATING; // The task will run
@@ -335,6 +374,12 @@ public class CraftScheduler implements BukkitScheduler {
@@ -341,6 +383,12 @@ public class CraftScheduler implements BukkitScheduler {
@Override
public List<BukkitWorker> getActiveWorkers() {
@ -287,7 +291,7 @@ index e102be58..5db848de 100644
final ArrayList<BukkitWorker> workers = new ArrayList<BukkitWorker>();
for (final CraftTask taskObj : runners.values()) {
// Iterator will be a best-effort (may fail to grab very new values) if called from an async thread
@@ -372,6 +417,11 @@ public class CraftScheduler implements BukkitScheduler {
@@ -378,6 +426,11 @@ public class CraftScheduler implements BukkitScheduler {
pending.add(task);
}
}
@ -299,7 +303,7 @@ index e102be58..5db848de 100644
return pending;
}
@@ -379,6 +429,11 @@ public class CraftScheduler implements BukkitScheduler {
@@ -385,6 +438,11 @@ public class CraftScheduler implements BukkitScheduler {
* This method is designed to never block or wait for locks; an immediate execution of all current tasks.
*/
public void mainThreadHeartbeat(final int currentTick) {
@ -311,7 +315,7 @@ index e102be58..5db848de 100644
this.currentTick = currentTick;
final List<CraftTask> temp = this.temp;
parsePending();
@@ -415,7 +470,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -421,7 +479,7 @@ public class CraftScheduler implements BukkitScheduler {
parsePending();
} else {
//debugTail = debugTail.setNext(new CraftAsyncDebugger(currentTick + RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
@ -320,7 +324,7 @@ index e102be58..5db848de 100644
// We don't need to parse pending
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
@@ -434,7 +489,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -440,7 +498,7 @@ public class CraftScheduler implements BukkitScheduler {
//debugHead = debugHead.getNextHead(currentTick); // Paper
}
@ -329,7 +333,7 @@ index e102be58..5db848de 100644
final AtomicReference<CraftTask> tail = this.tail;
CraftTask tailTask = tail.get();
while (!tail.compareAndSet(tailTask, task)) {
@@ -443,7 +498,13 @@ public class CraftScheduler implements BukkitScheduler {
@@ -449,7 +507,13 @@ public class CraftScheduler implements BukkitScheduler {
tailTask.setNext(task);
}
@ -344,7 +348,7 @@ index e102be58..5db848de 100644
task.setNextRun(currentTick + delay);
addTask(task);
return task;
@@ -462,8 +523,8 @@ public class CraftScheduler implements BukkitScheduler {
@@ -468,8 +532,8 @@ public class CraftScheduler implements BukkitScheduler {
return ids.incrementAndGet();
}
@ -355,8 +359,8 @@ index e102be58..5db848de 100644
CraftTask head = this.head;
CraftTask task = head.getNext();
CraftTask lastTask = head;
@@ -482,7 +543,7 @@ public class CraftScheduler implements BukkitScheduler {
task.setNext(null);
@@ -488,7 +552,7 @@ public class CraftScheduler implements BukkitScheduler {
task.setNext(null);
}
this.head = lastTask;
- MinecraftTimings.bukkitSchedulerPendingTimer.stopTiming();
@ -365,5 +369,5 @@ index e102be58..5db848de 100644
private boolean isReady(final int currentTick) {
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch
View File

@ -1,4 +1,4 @@
From 884e7260c35a99e7f1bcd59095718c506dd64ec5 Mon Sep 17 00:00:00 2001
From f6336af9739de0f97160223724d98efa324f9971 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 22 Mar 2018 01:40:24 -0400
Subject: [PATCH] getPlayerUniqueId API
@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b7eaa0fe..bc70d0fc 100644
index 3697b3298f..0ec8460989 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1402,6 +1402,26 @@ public final class CraftServer implements Server {
@@ -1403,6 +1403,26 @@ public final class CraftServer implements Server {
return recipients.size();
}
@ -40,5 +40,5 @@ index b7eaa0fe..bc70d0fc 100644
@Deprecated
public OfflinePlayer getOfflinePlayer(String name) {
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch
View File

@ -1,14 +1,14 @@
From 23c45dc6f86e4e10480417605172fab76f986aee Mon Sep 17 00:00:00 2001
From ec8f5fbdd3b942165876a395d64324a93e529a35 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 1 Apr 2018 02:29:37 +0300
Subject: [PATCH] Add method to open already placed sign
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index ce84885a..d5f55503 100644
index 191bb7345e..20f0783025 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -612,4 +612,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -617,4 +617,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
entity.remove();
}
}
@ -27,5 +27,5 @@ index ce84885a..d5f55503 100644
+ // Paper end
}
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch
View File

@ -1,4 +1,4 @@
From 7af280e9f9ac11163f93222bd790de28566a1a70 Mon Sep 17 00:00:00 2001
From 57202c428d5b37af59ddba5124934bd47b788877 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 15 Aug 2017 22:29:12 -0400
Subject: [PATCH] Expand World.spawnParticle API and add Builder
@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index eb99f3a9..da391e94 100644
index eb99f3a967..da391e945c 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -56,7 +56,7 @@ public class WorldServer extends World {
@ -43,10 +43,10 @@ index eb99f3a9..da391e94 100644
if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d3df3f59..daf305bb 100644
index e66c97ba9c..7d73fe4c59 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2285,11 +2285,17 @@ public class CraftWorld implements World {
@@ -2291,11 +2291,17 @@ public class CraftWorld implements World {
@Override
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
@ -66,5 +66,5 @@ index d3df3f59..daf305bb 100644
x, y, z, // Position
count, // Count
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch
View File

@ -1,4 +1,4 @@
From 81b581e0ad3f3e5d1426564630feda39ceb010d0 Mon Sep 17 00:00:00 2001
From 25caaaa1941940964265ef43367036d28837e9dc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 4 Jun 2018 20:39:20 -0400
Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
Item can be set inside of the Consumer pre spawn function.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index daf305bb..0b4821e1 100644
index 7d73fe4c59..2575228cb0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1487,6 +1487,10 @@ public class CraftWorld implements World {
@@ -1493,6 +1493,10 @@ public class CraftWorld implements World {
if (Boat.class.isAssignableFrom(clazz)) {
entity = new EntityBoat(world, x, y, z);
entity.setPositionRotation(x, y, z, yaw, pitch);
@ -23,5 +23,5 @@ index daf305bb..0b4821e1 100644
entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
} else if (Projectile.class.isAssignableFrom(clazz)) {
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch
View File

@ -1,4 +1,4 @@
From 74126edeb165e88aa5dbfeeea449d4d6623c4dfe Mon Sep 17 00:00:00 2001
From c4a96158ae10aab5885690d509723ea7a8d9f6ca Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 10 Jun 2018 20:20:15 -0400
Subject: [PATCH] Fix CraftEntity hashCode
@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle()
However, replaced it too to make it clearer of intent.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 495a7c46..915ccb18 100644
index 440bc4513b..bc2df82a5f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -723,14 +723,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -725,14 +725,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false;
}
final CraftEntity other = (CraftEntity) obj;
@ -45,5 +45,5 @@ index 495a7c46..915ccb18 100644
@Override
--
2.25.1.windows.1
2.26.2

14
Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch
View File

@ -1,11 +1,11 @@
From d69d147193305db0196bc2c7630a2563c3c373fc Mon Sep 17 00:00:00 2001
From ea41074f6be3789dca60ece6d8ee7fea44837926 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 16 Jun 2018 01:18:16 -0500
Subject: [PATCH] Make shield blocking delay configurable
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 9c52e31f..33ce9a50 100644
index 9c52e31f4c..33ce9a5004 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -367,4 +367,9 @@ public class PaperWorldConfig {
@ -19,10 +19,10 @@ index 9c52e31f..33ce9a50 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fe0b0822..a738848e 100644
index c5c0fc3877..8f6fe004a4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2998,7 +2998,7 @@ public abstract class EntityLiving extends Entity {
@@ -3001,7 +3001,7 @@ public abstract class EntityLiving extends Entity {
if (this.isHandRaised() && !this.activeItem.isEmpty()) {
Item item = this.activeItem.getItem();
@ -31,7 +31,7 @@ index fe0b0822..a738848e 100644
} else {
return false;
}
@@ -3237,4 +3237,15 @@ public abstract class EntityLiving extends Entity {
@@ -3240,4 +3240,15 @@ public abstract class EntityLiving extends Entity {
public void broadcastItemBreak(EnumHand enumhand) {
this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
}
@ -48,7 +48,7 @@ index fe0b0822..a738848e 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 23a48199..7d89c0e8 100644
index 1760dfa7a3..a8e44e95d6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -644,5 +644,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -68,5 +68,5 @@ index 23a48199..7d89c0e8 100644
// Paper end
}
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0235-Expand-Explosions-API.patch
View File

@ -1,4 +1,4 @@
From c2a1a378bb925940946aab42f08ec66c9c80803a Mon Sep 17 00:00:00 2001
From d65fca0c9a9c73059bc922d517c41ade7153d55e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Jun 2018 23:17:24 -0400
Subject: [PATCH] Expand Explosions API
@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0b4821e1..1787c2d2 100644
index 2575228cb0..4ad82354c4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -875,6 +875,11 @@ public class CraftWorld implements World {
@@ -881,6 +881,11 @@ public class CraftWorld implements World {
public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source) {
return !world.createExplosion(source == null ? null : ((CraftEntity) source).getHandle(), x, y, z, power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled;
}
@ -22,5 +22,5 @@ index 0b4821e1..1787c2d2 100644
@Override
public boolean createExplosion(Location loc, float power) {
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch
View File

@ -1,4 +1,4 @@
From a84a51b9f898ce2d668391b3da43966307835f5c Mon Sep 17 00:00:00 2001
From 270b76eb955fa2552a266020ad1df7a66c0fba6e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 29 Jun 2018 00:21:28 -0400
Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
How long an entity has raised hands to charge an attack or use an item
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 2196dbfc..fea821be 100644
index c1e6792e0d..a4051c1f0c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity {
@ -18,7 +18,7 @@ index 2196dbfc..fea821be 100644
protected int bl;
protected int bm;
private BlockPosition bE;
@@ -2976,10 +2976,12 @@ public abstract class EntityLiving extends Entity {
@@ -2979,10 +2979,12 @@ public abstract class EntityLiving extends Entity {
return this.activeItem;
}
@ -32,7 +32,7 @@ index 2196dbfc..fea821be 100644
return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 7d89c0e8..02346f1c 100644
index a8e44e95d6..3a87c6574b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -654,5 +654,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -62,5 +62,5 @@ index 7d89c0e8..02346f1c 100644
// Paper end
}
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch
View File

@ -1,14 +1,14 @@
From 8027a74b92f5d43d920a05c302c8b28abe767db9 Mon Sep 17 00:00:00 2001
From 2af5cfdcf69ece67c694519f80a1430638915526 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:08:14 +0200
Subject: [PATCH] Implement World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1787c2d2..588c8711 100644
index 4ad82354c4..e958042208 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1289,6 +1289,15 @@ public class CraftWorld implements World {
@@ -1295,6 +1295,15 @@ public class CraftWorld implements World {
return list;
}
@ -25,5 +25,5 @@ index 1787c2d2..588c8711 100644
public void save() {
org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
--
2.25.1.windows.1
2.26.2

26
Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch
View File

@ -1,4 +1,4 @@
From f45ba3c2d3cea875e1d7ea61203af19f4ca85dde Mon Sep 17 00:00:00 2001
From 23261131e1357288d6bfa8e3b07425383ce0a68d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Jul 2018 21:56:23 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
to "confirm" things based on if it was player triggered close or not.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 4721c288..36748ccb 100644
index 6e9dd4d371..684978be7c 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -34,7 +34,7 @@ index 4721c288..36748ccb 100644
this.activeContainer = this.defaultContainer;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d8721ab2..12ba65ed 100644
index 88692d9eae..f35d233406 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -368,7 +368,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -55,7 +55,7 @@ index d8721ab2..12ba65ed 100644
}
String deathMessage = event.getDeathMessage();
@@ -1055,7 +1055,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1057,7 +1057,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return OptionalInt.empty();
} else {
if (this.activeContainer != this.defaultContainer) {
@ -64,7 +64,7 @@ index d8721ab2..12ba65ed 100644
}
this.nextContainerCounter();
@@ -1115,7 +1115,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1117,7 +1117,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// CraftBukkit end
if (this.activeContainer != this.defaultContainer) {
@ -73,7 +73,7 @@ index d8721ab2..12ba65ed 100644
}
// this.nextContainerCounter(); // CraftBukkit - moved up
@@ -1179,7 +1179,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1181,7 +1181,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void closeInventory() {
@ -88,7 +88,7 @@ index d8721ab2..12ba65ed 100644
this.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4a0a8479..8eb12e89 100644
index 4a0a847944..8eb12e89ea 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2040,7 +2040,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -101,7 +101,7 @@ index 4a0a8479..8eb12e89 100644
this.player.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a61815c7..5ae0927c 100644
index a61815c794..5ae0927c14 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -390,7 +390,7 @@ public abstract class PlayerList {
@ -114,7 +114,7 @@ index a61815c7..5ae0927c 100644
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
cserver.getPluginManager().callEvent(playerQuitEvent);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index da391e94..c5b4218b 100644
index da391e945c..c5b4218b44 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1051,7 +1051,7 @@ public class WorldServer extends World {
@ -136,7 +136,7 @@ index da391e94..c5b4218b 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index d5f55503..1c88eace 100644
index 20f0783025..a6d75c0e07 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -467,8 +467,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@ -155,7 +155,7 @@ index d5f55503..1c88eace 100644
@Override
public boolean isBlocking() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 25c80a40..91ad5776 100644
index c69b3b33d8..ffbf2b983b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -785,7 +785,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -168,7 +168,7 @@ index 25c80a40..91ad5776 100644
// Check if the fromWorld and toWorld are the same.
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index caf27743..f931fa48 100644
index 1c1341230b..893aaaa1ca 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1293,8 +1293,19 @@ public class CraftEventFactory {
@ -193,5 +193,5 @@ index caf27743..f931fa48 100644
human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
}
--
2.25.1.windows.1
2.26.2

6
Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch
View File

@ -1,14 +1,14 @@
From f52e7ce0fdce36da196c298d84ac8b5d778c4cb6 Mon Sep 17 00:00:00 2001
From 88d409e97c231e0d2feddd4422df304165e39083 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 17 Jul 2018 16:42:17 +0200
Subject: [PATCH] Use asynchronous Log4j 2 loggers
diff --git a/pom.xml b/pom.xml
index 76ce7f4486..28ff064c19 100644
index 6fe4eff84b..fd417a9eeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,13 @@
@@ -77,6 +77,13 @@
<artifactId>log4j-iostreams</artifactId>
<version>2.8.1</version>
</dependency>

22
Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch
View File

@ -1,4 +1,4 @@
From 78f846465f4f93cb461215ef66ff965a3bcba3ab Mon Sep 17 00:00:00 2001
From 539a386def75c231538ac674bb0ace5950674099 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 28 Jul 2018 12:18:27 -0400
Subject: [PATCH] Ignore Dead Entities in entityList iteration
@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
they shouldn't of been in the list in the first place.
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
index b839769c..5acad8e4 100644
index b839769cea..5acad8e44f 100644
--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
@@ -179,6 +179,7 @@ public class PaperCommand extends Command {
@ -23,7 +23,7 @@ index b839769c..5acad8e4 100644
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 8d3c265c..8d6c5d18 100644
index 80b5013d95..f47ed1947e 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -796,6 +796,7 @@ public class Chunk implements IChunkAccess {
@ -51,7 +51,7 @@ index 8d3c265c..8d6c5d18 100644
if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
list.add(t0);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 356de07d..33cd7f7b 100644
index 838aa7da69..35d22ec027 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -195,6 +195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -63,7 +63,7 @@ index 356de07d..33cd7f7b 100644
public float getBukkitYaw() {
return this.yaw;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 87762b17..8d292604 100644
index 87762b1725..8d292604c3 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -908,7 +908,7 @@ public class WorldServer extends World {
@ -92,10 +92,10 @@ index 87762b17..8d292604 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 588c8711..e94ac028 100644
index e958042208..7d2d6566b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1025,6 +1025,7 @@ public class CraftWorld implements World {
@@ -1031,6 +1031,7 @@ public class CraftWorld implements World {
for (Object o : world.entitiesById.values()) {
if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -103,7 +103,7 @@ index 588c8711..e94ac028 100644
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1044,6 +1045,7 @@ public class CraftWorld implements World {
@@ -1050,6 +1051,7 @@ public class CraftWorld implements World {
for (Object o : world.entitiesById.values()) {
if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -111,7 +111,7 @@ index 588c8711..e94ac028 100644
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1070,6 +1072,7 @@ public class CraftWorld implements World {
@@ -1076,6 +1078,7 @@ public class CraftWorld implements World {
for (Object entity: world.entitiesById.values()) {
if (entity instanceof net.minecraft.server.Entity) {
@ -119,7 +119,7 @@ index 588c8711..e94ac028 100644
Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
if (bukkitEntity == null) {
@@ -1093,6 +1096,7 @@ public class CraftWorld implements World {
@@ -1099,6 +1102,7 @@ public class CraftWorld implements World {
for (Object entity: world.entitiesById.values()) {
if (entity instanceof net.minecraft.server.Entity) {
@ -128,5 +128,5 @@ index 588c8711..e94ac028 100644
if (bukkitEntity == null) {
--
2.25.1.windows.1
2.26.2

18
Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch
View File

@ -1,4 +1,4 @@
From d9584e11d270f4d10a69ad778b91a2602ea48311 Mon Sep 17 00:00:00 2001
From 83987cc4ebede2443b77bf33bd74c3dbbfb4a447 Mon Sep 17 00:00:00 2001
From: miclebrick <miclebrick@outlook.com>
Date: Wed, 8 Aug 2018 15:30:52 -0400
Subject: [PATCH] Add Early Warning Feature to WatchDog
@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
This will help diagnose what was going on in that time before the crash.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index adef07d4..214b577b 100644
index adef07d4d5..214b577b32 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -24,6 +24,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@ -36,7 +36,7 @@ index adef07d4..214b577b 100644
public static int tabSpamLimit = 500;
private static void tabSpamLimiters() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b292e504..1bbe4fd8 100644
index c502aedb8d..056cbdeec8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -870,6 +870,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -48,10 +48,10 @@ index b292e504..1bbe4fd8 100644
long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
lastTick = start - TICK_TIME; // Paper
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bc70d0fc..4cf28879 100644
index 0ec8460989..d15a857b30 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -770,6 +770,7 @@ public final class CraftServer implements Server {
@@ -771,6 +771,7 @@ public final class CraftServer implements Server {
@Override
public void reload() {
@ -59,7 +59,7 @@ index bc70d0fc..4cf28879 100644
reloadCount++;
configuration = YamlConfiguration.loadConfiguration(getConfigFile());
commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile());
@@ -882,6 +883,7 @@ public final class CraftServer implements Server {
@@ -883,6 +884,7 @@ public final class CraftServer implements Server {
enablePlugins(PluginLoadOrder.STARTUP);
enablePlugins(PluginLoadOrder.POSTWORLD);
getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));
@ -68,7 +68,7 @@ index bc70d0fc..4cf28879 100644
@Override
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 1cf214ea..e66050b8 100644
index 1cf214eaca..e66050b87a 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -225,7 +225,7 @@ public class SpigotConfig
@ -81,7 +81,7 @@ index 1cf214ea..e66050b8 100644
public static boolean bungee;
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index 121c7ff6..07936eeb 100644
index 121c7ff601..07936eeba2 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;
@ -183,5 +183,5 @@ index 121c7ff6..07936eeb 100644
{
interrupt();
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
View File

@ -1,14 +1,14 @@
From 2986a99dd3e2f8b30dfa8a74adecb337abc2d681 Mon Sep 17 00:00:00 2001
From 00fc1c9b2d7df8240b1394db6acea1956fd96df7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 15 Aug 2018 01:16:34 -0400
Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 29952379..91f2066b 100644
index a843c66dfa..a53bb7295c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -127,9 +127,16 @@ public class CraftChunk implements Chunk {
@@ -126,9 +126,16 @@ public class CraftChunk implements Chunk {
@Override
public BlockState[] getTileEntities() {
@ -25,7 +25,7 @@ index 29952379..91f2066b 100644
int index = 0;
net.minecraft.server.Chunk chunk = getHandle();
@@ -141,7 +148,7 @@ public class CraftChunk implements Chunk {
@@ -140,7 +147,7 @@ public class CraftChunk implements Chunk {
}
BlockPosition position = (BlockPosition) obj;
@ -35,5 +35,5 @@ index 29952379..91f2066b 100644
return entities;
--
2.25.1.windows.1
2.26.2

16
Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch
View File

@ -1,11 +1,11 @@
From 14fecaf11f803552ed46187c2fa561ffc28af497 Mon Sep 17 00:00:00 2001
From 189c94171b5014708f96dd11d18d01de927a959f Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 15 Aug 2018 01:26:09 -0700
Subject: [PATCH] Allow disabling armour stand ticking
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index eaaa51e4..bc3df01a 100644
index eaaa51e4bf..bc3df01aab 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -393,4 +393,10 @@ public class PaperWorldConfig {
@ -20,7 +20,7 @@ index eaaa51e4..bc3df01a 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 61d7d507..42b9a339 100644
index 61d7d507aa..42b9a339e9 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -44,6 +44,12 @@ public class EntityArmorStand extends EntityLiving {
@ -142,10 +142,10 @@ index 61d7d507..42b9a339 100644
public Vector3f r() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fea821be..0b84ead5 100644
index a4051c1f0c..990aea604d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2326,52 +2326,7 @@ public abstract class EntityLiving extends Entity {
@@ -2329,52 +2329,7 @@ public abstract class EntityLiving extends Entity {
}
}
@ -199,7 +199,7 @@ index fea821be..0b84ead5 100644
if (this.ticksLived % 20 == 0) {
this.getCombatTracker().g();
@@ -2472,6 +2427,55 @@ public abstract class EntityLiving extends Entity {
@@ -2475,6 +2430,55 @@ public abstract class EntityLiving extends Entity {
}
}
@ -256,7 +256,7 @@ index fea821be..0b84ead5 100644
float f2 = MathHelper.g(f - this.aI);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index d1d689e5..ac105270 100644
index d1d689e5d7..ac105270d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -297,5 +297,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@ -277,5 +277,5 @@ index d1d689e5..ac105270 100644
// Paper end
}
--
2.25.1.windows.1
2.26.2

12
Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch
View File

@ -1,11 +1,11 @@
From ee158658a7daac620ed254197b946dfce35290af Mon Sep 17 00:00:00 2001
From f78ff17681e1dabb3b988a034059b47107e65b16 Mon Sep 17 00:00:00 2001
From: Mystiflow <mystiflow@gmail.com>
Date: Fri, 6 Jul 2018 13:21:30 +0100
Subject: [PATCH] Send nearby packets from world player list not server list
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 5ae0927c..6b672018 100644
index 5ae0927c14..6b67201852 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -910,8 +910,25 @@ public abstract class PlayerList {
@ -46,7 +46,7 @@ index 5ae0927c..6b672018 100644
double d5 = d1 - entityplayer.locY();
double d6 = d2 - entityplayer.locZ();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8d292604..09176e60 100644
index 8d292604c3..09176e6040 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1290,7 +1290,7 @@ public class WorldServer extends World {
@ -68,10 +68,10 @@ index 8d292604..09176e60 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e94ac028..d61769b4 100644
index 7d2d6566b2..49055d48b5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2120,7 +2120,7 @@ public class CraftWorld implements World {
@@ -2126,7 +2126,7 @@ public class CraftWorld implements World {
double z = loc.getZ();
PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch);
@ -81,5 +81,5 @@ index e94ac028..d61769b4 100644
private static Map<String, GameRules.GameRuleKey<?>> gamerules;
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
View File

@ -1,4 +1,4 @@
From 8707fd0b7db5806f4db49a77cd944b6a26380efc Mon Sep 17 00:00:00 2001
From 6bdd4914f0674a84e457c1d9d98a35a989545b33 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 2 Sep 2018 19:34:33 -0700
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@ -6,10 +6,10 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d61769b4..6e1ae94c 100644
index 49055d48b5..dee18a2e28 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -499,7 +499,7 @@ public class CraftWorld implements World {
@@ -501,7 +501,7 @@ public class CraftWorld implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
@ -19,5 +19,5 @@ index d61769b4..6e1ae94c 100644
// If generate = false, but the chunk already exists, we will get this back.
if (chunk instanceof ProtoChunkExtension) {
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch
View File

@ -1,14 +1,14 @@
From d3b3cbc37c86796149d287801e75104238ca1d20 Mon Sep 17 00:00:00 2001
From 7c204fab3ce057f19616da84e0c0ef7a0c6b113d Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 3 Sep 2018 18:20:03 -0500
Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0b84ead5..fa097e05 100644
index 990aea604d..93625dea9c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3254,6 +3254,23 @@ public abstract class EntityLiving extends Entity {
@@ -3257,6 +3257,23 @@ public abstract class EntityLiving extends Entity {
this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
}
// Paper start
@ -33,7 +33,7 @@ index 0b84ead5..fa097e05 100644
public int getShieldBlockingDelay() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 02346f1c..d197094f 100644
index 3a87c6574b..9e082d4514 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -196,6 +196,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -66,5 +66,5 @@ index 02346f1c..d197094f 100644
public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
return getLineOfSight(transparent, maxDistance, 2);
--
2.25.1.windows.1
2.26.2

26
Spigot-Server-Patches/0290-Improve-death-events.patch
View File

@ -1,4 +1,4 @@
From 368cd7d7cc190d3cc714dc97b217f09fa9c0c393 Mon Sep 17 00:00:00 2001
From 0266ed2e47f1d4c2683da3b22d2512359e6239a9 Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Tue, 21 Aug 2018 01:39:35 +0100
Subject: [PATCH] Improve death events
@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
internal code.
diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
index 6daa400d..38fe29f8 100644
index 6daa400d27..38fe29f8a2 100644
--- a/src/main/java/net/minecraft/server/CombatTracker.java
+++ b/src/main/java/net/minecraft/server/CombatTracker.java
@@ -175,6 +175,7 @@ public class CombatTracker {
@ -27,7 +27,7 @@ index 6daa400d..38fe29f8 100644
int i = this.f ? 300 : 100;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 33cd7f7b..09c57605 100644
index 35d22ec027..09bb8676c3 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -47,7 +47,7 @@ index 33cd7f7b..09c57605 100644
protected void k(double d0, double d1, double d2) {
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 42b9a339..8ad131e4 100644
index 42b9a339e9..8ad131e4fc 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -701,7 +701,8 @@ public class EntityArmorStand extends EntityLiving {
@ -61,7 +61,7 @@ index 42b9a339..8ad131e4 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 2be6c7bd..82a32d5d 100644
index 2be6c7bde9..82a32d5dbf 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal {
@ -94,7 +94,7 @@ index 2be6c7bd..82a32d5d 100644
public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
index 80717ad9..53aac5bc 100644
index 80717ad9ac..53aac5bccd 100644
--- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
@@ -55,11 +55,19 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract {
@ -119,7 +119,7 @@ index 80717ad9..53aac5bc 100644
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fa097e05..eed3e7c5 100644
index 93625dea9c..3d56682719 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -89,7 +89,7 @@ public abstract class EntityLiving extends Entity {
@ -265,7 +265,7 @@ index fa097e05..eed3e7c5 100644
@Nullable
protected SoundEffect getSoundDeath() {
return SoundEffects.ENTITY_GENERIC_DEATH;
@@ -1921,10 +1953,12 @@ public abstract class EntityLiving extends Entity {
@@ -1924,10 +1956,12 @@ public abstract class EntityLiving extends Entity {
}
@ -279,7 +279,7 @@ index fa097e05..eed3e7c5 100644
return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 12ba65ed..e6a4defd 100644
index f35d233406..f43584f0e3 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -76,6 +76,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -330,7 +330,7 @@ index 12ba65ed..e6a4defd 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
index 90fdf89c..b761a41d 100644
index 90fdf89c81..b761a41dcd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
@@ -821,6 +821,22 @@ public enum CraftSound {
@ -357,7 +357,7 @@ index 90fdf89c..b761a41d 100644
this.minecraftKey = minecraftKey;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c7bd3015..823dba01 100644
index a874ae6758..a8f46ceb4b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1698,7 +1698,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -378,7 +378,7 @@ index c7bd3015..823dba01 100644
public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index f006b441..39ce40bd 100644
index 80e0afad50..f14689bc02 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -749,9 +749,16 @@ public class CraftEventFactory {
@ -447,5 +447,5 @@ index f006b441..39ce40bd 100644
* Server methods
*/
--
2.25.1.windows.1
2.26.2

14
Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch
View File

@ -1,4 +1,4 @@
From 83dcfa541d103b236a0b0e832cd09481e17fcc2a Mon Sep 17 00:00:00 2001
From 722041c70e153af4c02d42be466ed8d5377e09b2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 17 Sep 2018 23:05:31 -0400
Subject: [PATCH] Support Overriding World Seeds
@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
a permanent change in that it won't go back if you remove it from paper.yml
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 214b577b..559e6b42 100644
index 214b577b32..559e6b42ba 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@ -59,7 +59,7 @@ index 214b577b..559e6b42 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1bbe4fd8..6c6e8eae 100644
index 056cbdeec8..ec4ce59c5e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -378,7 +378,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -72,7 +72,7 @@ index 1bbe4fd8..6c6e8eae 100644
if (j == 0) {
diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
index 561b6d94..95518e54 100644
index 561b6d9469..95518e54d1 100644
--- a/src/main/java/net/minecraft/server/WorldData.java
+++ b/src/main/java/net/minecraft/server/WorldData.java
@@ -127,7 +127,7 @@ public class WorldData {
@ -85,10 +85,10 @@ index 561b6d94..95518e54 100644
String s = nbttagcompound.getString("generatorName");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4cf28879..f36b6424 100644
index d15a857b30..011d0927da 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1015,7 +1015,7 @@ public final class CraftServer implements Server {
@@ -1016,7 +1016,7 @@ public final class CraftServer implements Server {
WorldSettings worldSettings;
// See MinecraftServer.a(String, String, long, WorldType, JsonElement)
if (worlddata == null) {
@ -98,5 +98,5 @@ index 4cf28879..f36b6424 100644
if (parsedSettings.isJsonObject()) {
worldSettings.setGeneratorSettings(parsedSettings.getAsJsonObject());
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch
View File

@ -1,4 +1,4 @@
From 1f356bdd9299e51edb45240987e154788130888f Mon Sep 17 00:00:00 2001
From 1bbb0075a34dc8bc194419cbf70187d760c3a3a7 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 25 Sep 2018 06:53:43 +0200
Subject: [PATCH] Avoid dimension id collisions
@ -8,10 +8,10 @@ we would reuse an existing dimension id, if some other dimension was
unloaded before.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f36b6424..4289d029 100644
index 011d0927da..3c43f318c4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1001,7 +1001,7 @@ public final class CraftServer implements Server {
@@ -1002,7 +1002,7 @@ public final class CraftServer implements Server {
boolean used = false;
do {
for (WorldServer server : console.getWorlds()) {
@ -21,5 +21,5 @@ index f36b6424..4289d029 100644
dimension++;
break;
--
2.25.1.windows.1
2.26.2

12
Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch
View File

@ -1,4 +1,4 @@
From 7fbced0cdb08c7054eac75e95fc41851dbc20426 Mon Sep 17 00:00:00 2001
From c6ce71433a501052c132a80729e6f87ad726a10a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io>
Date: Wed, 3 Oct 2018 20:09:18 -0400
Subject: [PATCH] Hook into CB plugin rewrites
@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
debugging in an IDE pre-relocate.
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
index 2d334a59..79c9489c 100644
index 9b4a0f0678..2c6814f131 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
@@ -6,7 +6,9 @@ import java.io.FileOutputStream;
@ -37,7 +37,7 @@ index 2d334a59..79c9489c 100644
/**
* This file is imported from Commodore.
*
@@ -45,6 +52,42 @@ public class Commodore
@@ -46,6 +53,42 @@ public class Commodore
"org/bukkit/inventory/ItemStack (I)V setTypeId"
) );
@ -80,7 +80,7 @@ index 2d334a59..79c9489c 100644
public static void main(String[] args)
{
OptionParser parser = new OptionParser();
@@ -129,15 +172,90 @@ public class Commodore
@@ -130,15 +173,90 @@ public class Commodore
cr.accept( new ClassVisitor( Opcodes.ASM7, cw )
{
@ -171,7 +171,7 @@ index 2d334a59..79c9489c 100644
if ( modern )
{
if ( owner.equals( "org/bukkit/Material" ) )
@@ -236,6 +354,14 @@ public class Commodore
@@ -237,6 +355,14 @@ public class Commodore
return;
}
@ -187,5 +187,5 @@ index 2d334a59..79c9489c 100644
{
if ( owner.equals( "org/bukkit/Material" ) )
--
2.25.1.windows.1
2.26.2

12
Spigot-Server-Patches/0308-Add-sun-related-API.patch
View File

@ -1,11 +1,11 @@
From c40bedc48e521d9c3b9326da8026583615f05667 Mon Sep 17 00:00:00 2001
From 6a8e02eb2416fef7e2a34cd423a75dd80a2bc64f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:21 -0500
Subject: [PATCH] Add sun related API
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index b5816dc8..bed15873 100644
index b5816dc89e..bed15873b6 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1341,6 +1341,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -17,10 +17,10 @@ index b5816dc8..bed15873 100644
if (this.world.isDay() && !this.world.isClientSide) {
float f = this.aI();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 6e1ae94c..06b2e8b9 100644
index dee18a2e28..b9a4c21ab5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -856,6 +856,13 @@ public class CraftWorld implements World {
@@ -862,6 +862,13 @@ public class CraftWorld implements World {
}
}
@ -35,7 +35,7 @@ index 6e1ae94c..06b2e8b9 100644
public boolean createExplosion(double x, double y, double z, float power) {
return createExplosion(x, y, z, power, false, true);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
index c89bc702..eaad222f 100644
index c89bc7024b..eaad222fd3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
@@ -78,4 +78,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@ -51,5 +51,5 @@ index c89bc702..eaad222f 100644
+ // Paper end
}
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch
View File

@ -1,11 +1,11 @@
From 77c97810a804f4f686a5e3ea7742a6643e3e6a23 Mon Sep 17 00:00:00 2001
From 8b8ec3a2fefaceaeb38dacfe5251360b15ac388e Mon Sep 17 00:00:00 2001
From: Caleb Bassham <caleb.bassham@gmail.com>
Date: Fri, 28 Sep 2018 02:32:19 -0500
Subject: [PATCH] Call player spectator target events
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index e6a4defd..d63ab3e2 100644
index f43584f0e3..bc62a9f08e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -17,7 +17,7 @@ index e6a4defd..d63ab3e2 100644
public boolean worldChangeInvuln;
private boolean cm; private void setHasSeenCredits(boolean has) { this.cm = has; } // Paper - OBFHELPER
private final RecipeBookServer recipeBook;
@@ -1584,15 +1584,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1586,15 +1586,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity);
}
@ -58,7 +58,7 @@ index e6a4defd..d63ab3e2 100644
}
@Override
@@ -1600,7 +1620,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1602,7 +1622,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (this.portalCooldown > 0 && !this.worldChangeInvuln) {
--this.portalCooldown;
}
@ -67,5 +67,5 @@ index e6a4defd..d63ab3e2 100644
@Override
--
2.25.1.windows.1
2.26.2

22
Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch
View File

@ -1,4 +1,4 @@
From 5068d40d1c6384382106cf9df4289f84f17f9d28 Mon Sep 17 00:00:00 2001
From 17eecd413a0301f1fb6517449447bec95c7b9d20 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Mon, 8 Oct 2018 14:36:14 -0400
Subject: [PATCH] Add Velocity IP Forwarding Support
@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
login plugin message packet.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 092bff78..79cf4e59 100644
index 092bff78ab..79cf4e598f 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -8,6 +8,7 @@ import java.io.IOException;
@ -58,7 +58,7 @@ index 092bff78..79cf4e59 100644
}
diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
new file mode 100644
index 00000000..fdd8708f
index 0000000000..fdd8708f97
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
@@ -0,0 +1,67 @@
@ -130,7 +130,7 @@ index 00000000..fdd8708f
+ }
+}
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index 1c4ac7bf..47cf1050 100644
index 1c4ac7bf7a..47cf105019 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
@ -206,7 +206,7 @@ index 1c4ac7bf..47cf1050 100644
}
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 08e314af..046196d5 100644
index 08e314af7c..046196d54d 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -44,7 +44,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -219,7 +219,7 @@ index 08e314af..046196d5 100644
public java.util.UUID spoofedUUID;
public com.mojang.authlib.properties.Property[] spoofedProfile;
diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
index 93ae6dcd..fb9186b3 100644
index 93ae6dcd78..fb9186b3f5 100644
--- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
@@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@ -247,7 +247,7 @@ index 93ae6dcd..fb9186b3 100644
int j = this.i();
diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
index 4d1f4413..c1ca6f95 100644
index 4d1f441395..c1ca6f9501 100644
--- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
+++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
@@ -4,8 +4,8 @@ import java.io.IOException;
@ -262,7 +262,7 @@ index 4d1f4413..c1ca6f95 100644
public PacketLoginInCustomPayload() {}
diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
index ae74dc9e..7eb230f1 100644
index ae74dc9e18..7eb230f1b2 100644
--- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
+++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
@@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
@ -281,10 +281,10 @@ index ae74dc9e..7eb230f1 100644
public void a(PacketDataSerializer packetdataserializer) throws IOException {
this.a = packetdataserializer.i();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4289d029..fa35b845 100644
index 3c43f318c4..7b53ebb6d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -647,7 +647,7 @@ public final class CraftServer implements Server {
@@ -648,7 +648,7 @@ public final class CraftServer implements Server {
@Override
public long getConnectionThrottle() {
// Spigot Start - Automatically set connection throttle for bungee configurations
@ -294,5 +294,5 @@ index 4289d029..fa35b845 100644
} else {
return this.configuration.getInt("settings.connection-throttle");
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch
View File

@ -1,11 +1,11 @@
From 1c0b2ac1832dbc7be6317a5febfb3a5e57fcb94f Mon Sep 17 00:00:00 2001
From be7c95d3a46cdd0d3b6ffd858ae228cbcf351f68 Mon Sep 17 00:00:00 2001
From: GreenMeanie <GreenMeanieMC@gmail.com>
Date: Sat, 20 Oct 2018 22:34:02 -0400
Subject: [PATCH] Reset players airTicks on respawn
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d1ab124f..3a3e491a 100644
index 8d3140871f..1488616f39 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2330,6 +2330,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -17,10 +17,10 @@ index d1ab124f..3a3e491a 100644
return 300;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d63ab3e2..bb9a2476 100644
index bc62a9f08e..cf71ad016a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1860,6 +1860,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1862,6 +1862,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
this.setHealth(this.getMaxHealth());
@ -29,5 +29,5 @@ index d63ab3e2..bb9a2476 100644
this.fallDistance = 0;
this.foodData = new FoodMetaData(this);
--
2.25.1.windows.1
2.26.2

16
Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch
View File

@ -1,4 +1,4 @@
From 5290c4b714fe7a7bef8fb0a2ba0a0c165cb29aa7 Mon Sep 17 00:00:00 2001
From 63fcabba36fc0667906489add90ddab3ee362294 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 15 Nov 2018 13:38:37 +0000
Subject: [PATCH] force entity dismount during teleportation
@ -20,7 +20,7 @@ this is going to be the best soultion all around.
Improvements/suggestions welcome!
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3a3e491a..725fa950 100644
index 1488616f39..3fc3b76436 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2031,12 +2031,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -72,7 +72,7 @@ index 3a3e491a..725fa950 100644
if (event.isCancelled()) {
return false;
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 308ac18f..584166f2 100644
index f41975165a..61c9e030a1 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -968,9 +968,11 @@ public abstract class EntityHuman extends EntityLiving {
@ -91,10 +91,10 @@ index 308ac18f..584166f2 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index eed3e7c5..4e64a80a 100644
index 3d56682719..c7c248f63f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2735,11 +2735,13 @@ public abstract class EntityLiving extends Entity {
@@ -2738,11 +2738,13 @@ public abstract class EntityLiving extends Entity {
return ((Byte) this.datawatcher.get(EntityLiving.ao) & 4) != 0;
}
@ -112,10 +112,10 @@ index eed3e7c5..4e64a80a 100644
this.a(entity);
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index bb9a2476..ad40c254 100644
index cf71ad016a..960e1fd4ad 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1021,11 +1021,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1023,11 +1023,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
}
@ -133,5 +133,5 @@ index bb9a2476..ad40c254 100644
if (entity1 != entity && this.playerConnection != null) {
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch
View File

@ -1,11 +1,11 @@
From 759d73d323748afb8da0c1436449c4ed0c221fef Mon Sep 17 00:00:00 2001
From a2a81762765b98cb4ee2353a72a0c42ab6815db6 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 18 Nov 2018 19:49:56 +0000
Subject: [PATCH] Make the default permission message configurable
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 6d069c73..dbd14399 100644
index 6d069c73d0..dbd1439970 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -20,6 +20,7 @@ import java.util.regex.Pattern;
@ -29,10 +29,10 @@ index 6d069c73..dbd14399 100644
private static void savePlayerData() {
savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fa35b845..30dd66b8 100644
index 7b53ebb6d7..811e676e4f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2179,6 +2179,11 @@ public final class CraftServer implements Server {
@@ -2180,6 +2180,11 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
}
@ -45,5 +45,5 @@ index fa35b845..30dd66b8 100644
public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
return createProfile(uuid, null);
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
View File

@ -1,14 +1,14 @@
From 80c540434a5694c897aa6e092ceadf571b309f92 Mon Sep 17 00:00:00 2001
From ef6c8f1c4076d33dbbef736e15a7dc1b5224176e Mon Sep 17 00:00:00 2001
From: connorhartley <vectrixu+gh@gmail.com>
Date: Mon, 7 Jan 2019 14:43:48 -0600
Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index fd7d2fb1..cd981e0a 100644
index c5b8e76e2c..17c9c90359 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1289,6 +1289,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1291,6 +1291,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void n() {
this.cq = true;
this.ejectPassengers();
@ -23,5 +23,5 @@ index fd7d2fb1..cd981e0a 100644
this.wakeup(true, false);
}
--
2.25.1.windows.1
2.26.2

19
Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch
View File

@ -1,4 +1,4 @@
From 7c976b229c03c5067ad212d6821eb2c774d6ed66 Mon Sep 17 00:00:00 2001
From 3730b342fbaa3df1d482b4adbb34612ea9c8b84d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 15 Feb 2019 01:08:19 -0500
Subject: [PATCH] Allow Saving of Oversized Chunks
@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
to a jar with this fix, the data will be restored.
diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
index db66d4ac..2322c0c8 100644
index db66d4ac7d..2322c0c8c5 100644
--- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
+++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
@@ -69,6 +69,7 @@ public class NBTCompressedStreamTools {
@ -51,7 +51,7 @@ index db66d4ac..2322c0c8 100644
a((NBTBase) nbttagcompound, dataoutput);
}
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
index cee1ea8f..6b543f89 100644
index cee1ea8f43..6b543f89d4 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -17,6 +17,8 @@ import java.nio.file.Files;
@ -156,10 +156,10 @@ index cee1ea8f..6b543f89 100644
private final ChunkCoordIntPair b;
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index 57ce53cf..b3d1bb5f 100644
index 5065ece393..942b7d3239 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -42,10 +42,84 @@ public final class RegionFileCache implements AutoCloseable {
@@ -42,6 +42,74 @@ public final class RegionFileCache implements AutoCloseable {
}
}
@ -233,7 +233,10 @@ index 57ce53cf..b3d1bb5f 100644
+
@Nullable
public NBTTagCompound read(ChunkCoordIntPair chunkcoordintpair) throws IOException {
RegionFile regionfile = this.getFile(chunkcoordintpair, false); // CraftBukkit
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
@@ -51,6 +119,12 @@ public final class RegionFileCache implements AutoCloseable {
}
// CraftBukkit end
DataInputStream datainputstream = regionfile.a(chunkcoordintpair);
+ // Paper start
+ if (regionfile.isOversized(chunkcoordintpair.x, chunkcoordintpair.z)) {
@ -244,7 +247,7 @@ index 57ce53cf..b3d1bb5f 100644
Throwable throwable = null;
NBTTagCompound nbttagcompound;
@@ -86,6 +160,7 @@ public final class RegionFileCache implements AutoCloseable {
@@ -91,6 +165,7 @@ public final class RegionFileCache implements AutoCloseable {
try {
NBTCompressedStreamTools.a(nbttagcompound, (DataOutput) dataoutputstream);
@ -253,5 +256,5 @@ index 57ce53cf..b3d1bb5f 100644
throwable = throwable1;
throw throwable1;
--
2.25.1.windows.1
2.26.2

16
Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch
View File

@ -1,11 +1,11 @@
From 1da143dfb35fd5d19afedeaae1fde0054b3dabe6 Mon Sep 17 00:00:00 2001
From c12ef7fd696c115efff8c55b0ec24468888b0397 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Sep 2018 00:33:08 -0500
Subject: [PATCH] Add LivingEntity#getTargetEntity
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
index f427953a..3fdb5200 100644
index f427953a83..3fdb52007a 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -108,6 +108,7 @@ public class AxisAlignedBB {
@ -46,7 +46,7 @@ index f427953a..3fdb5200 100644
double[] adouble = new double[]{1.0D};
double d0 = vec3d1.x - vec3d.x;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 725fa950..427d66ed 100644
index 3fc3b76436..3a1d97c290 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1475,6 +1475,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -66,10 +66,10 @@ index 725fa950..427d66ed 100644
return 0.0F;
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4e64a80a..af79b6e3 100644
index c7c248f63f..aecd5011cb 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3307,6 +3307,37 @@ public abstract class EntityLiving extends Entity {
@@ -3310,6 +3310,37 @@ public abstract class EntityLiving extends Entity {
return world.rayTrace(raytrace);
}
@ -108,7 +108,7 @@ index 4e64a80a..af79b6e3 100644
public int getShieldBlockingDelay() {
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index c1f462d9..498f3810 100644
index c1f462d9d3..498f381099 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -18,6 +18,7 @@ public final class IEntitySelector {
@ -120,7 +120,7 @@ index c1f462d9..498f3810 100644
return !entity.isSpectator();
};
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index d197094f..6de01e4f 100644
index 9e082d4514..7d101d9630 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -216,6 +216,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -158,5 +158,5 @@ index d197094f..6de01e4f 100644
@Override
--
2.25.1.windows.1
2.26.2

14
Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch
View File

@ -1,4 +1,4 @@
From 0afaa0297d1a19f756c2d235d708378878d0751a Mon Sep 17 00:00:00 2001
From d207248747c89cbe150491fac917ac4bf2f3fd4e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Mar 2019 00:24:52 -0400
Subject: [PATCH] Entity#getEntitySpawnReason
@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
or DEFAULT since data was not stored.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 427d66ed..bb1fd6e4 100644
index 3a1d97c290..030c9992eb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -59,7 +59,7 @@ index 427d66ed..bb1fd6e4 100644
} catch (Throwable throwable) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index e9908cd0..7745e70d 100644
index e9908cd01f..7745e70d2d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -238,7 +238,7 @@ public abstract class PlayerList {
@ -72,7 +72,7 @@ index e9908cd0..7745e70d 100644
});
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 43565dd9..f7a1fad9 100644
index 43565dd92c..f7a1fad9c1 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1001,6 +1001,7 @@ public class WorldServer extends World {
@ -84,10 +84,10 @@ index 43565dd9..f7a1fad9 100644
if (entity.valid) {
MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 915ccb18..dfa15372 100644
index bc2df82a5f..ff60568ce4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1051,5 +1051,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1053,5 +1053,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public boolean fromMobSpawner() {
return getHandle().spawnedViaMobSpawner;
}
@ -99,5 +99,5 @@ index 915ccb18..dfa15372 100644
// Paper end
}
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
View File

@ -1,4 +1,4 @@
From d65be54697edd9be2d020a1e7201ed1df21dd616 Mon Sep 17 00:00:00 2001
From dc9a7fdfadcee5c6eef1a8d4c907f9072117cdbf Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Sat, 27 Apr 2019 20:00:43 +0100
Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
This also fixes the adding sound playing when the item frame direction is changed.
diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
index 9b1e0745..f8a2f32f 100644
index 9b1e07452f..f8a2f32f1d 100644
--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
@@ -224,7 +224,7 @@ public class EntityItemFrame extends EntityHanging {
@ -19,18 +19,18 @@ index 9b1e0745..f8a2f32f 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
index 799036f2..9ad180d9 100644
index 2873ff9d1f..a3613edcbb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
@@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
old.die();
EntityItemFrame frame = new EntityItemFrame(world,position,direction);
EntityItemFrame frame = new EntityItemFrame(world, position, direction);
- frame.setItem(item);
+ frame.setItem(item, true, false); // Paper - fix itemframe sound
world.addEntity(frame);
this.entity = frame;
}
--
2.25.1.windows.1
2.26.2

6
Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
View File

@ -1,4 +1,4 @@
From 15b80c69702bd35edf18d4b7c07cb12d0e7cdca3 Mon Sep 17 00:00:00 2001
From 9a321e2b4d5428280329c33fa8c47479a3783216 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Mon, 13 May 2019 21:10:59 -0700
Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
@ -29,10 +29,10 @@ index 249eaf56bc..45882ee30f 100644
@Deprecated
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 30dd66b81a..0df49581fb 100644
index 811e676e4f..14cc12d772 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1705,7 +1705,7 @@ public final class CraftServer implements Server {
@@ -1706,7 +1706,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {

16
Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch
View File

@ -1,4 +1,4 @@
From dea664111743b5a739f4b4c12c6cb4551f867878 Mon Sep 17 00:00:00 2001
From 302c8671438fd163891620f24b30992b5b10c81f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 14:27:34 -0400
Subject: [PATCH] Duplicate UUID Resolve Option
@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 4ba72275..572679e4 100644
index 4ba72275b9..572679e4d1 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -442,4 +442,43 @@ public class PaperWorldConfig {
@ -81,7 +81,7 @@ index 4ba72275..572679e4 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 8d6c5d18..23cc0c36 100644
index f47ed1947e..7bcdbe713d 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -478,6 +478,7 @@ public class Chunk implements IChunkAccess {
@ -93,10 +93,10 @@ index 8d6c5d18..23cc0c36 100644
int k = MathHelper.floor(entity.locY() / 16.0D);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index bb1fd6e4..0900db05 100644
index 030c9992eb..fd6dad8437 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2747,6 +2747,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2749,6 +2749,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
});
}
@ -105,7 +105,7 @@ index bb1fd6e4..0900db05 100644
this.uniqueID = uuid;
this.am = this.uniqueID.toString();
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index f640d2ac..863c47b7 100644
index 2c7e611663..3c237b259e 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1,6 +1,7 @@
@ -197,7 +197,7 @@ index f640d2ac..863c47b7 100644
ChunkCoordIntPair chunkcoordintpair = playerchunk.i();
CompletableFuture<Either<List<IChunkAccess>, PlayerChunk.Failure>> completablefuture = this.a(chunkcoordintpair, 1, (i) -> {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index e34ea3d0..f9ee9afe 100644
index e34ea3d098..f9ee9afe3a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
@ -236,5 +236,5 @@ index e34ea3d0..f9ee9afe 100644
}
}
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch
View File

@ -1,4 +1,4 @@
From e5c6cc0ae662261db0ce8a54e103a7a480c74613 Mon Sep 17 00:00:00 2001
From 32c4bb0dc1ef1627532a2e9cadf9d68211c8eef0 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 21 May 2019 02:34:04 +0100
Subject: [PATCH] improve CraftWorld#isChunkLoaded
@ -9,10 +9,10 @@ waiting for the execution queue to get to our request; We can just query
the chunk status and get a response now, vs having to wait
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 693dc983..8b6d22e7 100644
index 29780ee2e0..7033568871 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -403,14 +403,13 @@ public class CraftWorld implements World {
@@ -405,14 +405,13 @@ public class CraftWorld implements World {
@Override
public boolean isChunkLoaded(int x, int z) {
@ -30,5 +30,5 @@ index 693dc983..8b6d22e7 100644
throw new RuntimeException(ex);
}
--
2.25.1.windows.1
2.26.2

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

@ -1,4 +1,4 @@
From d35736b1430f4309466273e1833791124c64c638 Mon Sep 17 00:00:00 2001
From 70a7d24cdf80de7aad674e23d5bfd407c04e2d03 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
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
This lets you disable it for some worlds and lower it for others.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 572679e4..071e5e7f 100644
index 572679e4d1..071e5e7f72 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -481,4 +481,10 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 572679e4..071e5e7f 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 91af2563..e9841ef5 100644
index 45882ee30f..0ee1d8e486 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -586,6 +586,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -60,7 +60,7 @@ index 91af2563..e9841ef5 100644
// CraftBukkit start
// this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
diff --git a/src/main/java/net/minecraft/server/WorldLoadListener.java b/src/main/java/net/minecraft/server/WorldLoadListener.java
index d6762d38..7b6f5b2d 100644
index d6762d3853..7b6f5b2da0 100644
--- a/src/main/java/net/minecraft/server/WorldLoadListener.java
+++ b/src/main/java/net/minecraft/server/WorldLoadListener.java
@@ -9,4 +9,6 @@ public interface WorldLoadListener {
@ -71,7 +71,7 @@ index d6762d38..7b6f5b2d 100644
+ void setChunkRadius(int radius); // Paper - allow changing chunk radius
}
diff --git a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
index 3868572a..ae77805f 100644
index 3868572aed..ae77805f71 100644
--- a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
+++ b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
@@ -7,16 +7,24 @@ import org.apache.logging.log4j.Logger;
@ -102,7 +102,7 @@ index 3868572a..ae77805f 100644
@Override
public void a(ChunkCoordIntPair chunkcoordintpair) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f9ee9afe..389c9d03 100644
index f9ee9afe3a..389c9d03a1 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1598,13 +1598,89 @@ public class WorldServer extends World {
@ -199,10 +199,10 @@ index f9ee9afe..389c9d03 100644
public LongSet getForceLoadedChunks() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8b6d22e7..661a89c5 100644
index 7033568871..12ba7d1817 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1928,15 +1928,21 @@ public class CraftWorld implements World {
@@ -1934,15 +1934,21 @@ public class CraftWorld implements World {
@Override
public void setKeepSpawnInMemory(boolean keepLoaded) {
@ -229,5 +229,5 @@ index 8b6d22e7..661a89c5 100644
@Override
--
2.25.1.windows.1
2.26.2

14
Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch
View File

@ -1,4 +1,4 @@
From d448c0b0eefa84d6cf7e032387816ff8db2a8eef Mon Sep 17 00:00:00 2001
From 2d5eef6875a913baadfec3d0bdbe878534817e53 Mon Sep 17 00:00:00 2001
From: simpleauthority <jacob@algorithmjunkie.com>
Date: Tue, 28 May 2019 03:48:51 -0700
Subject: [PATCH] Implement CraftBlockSoundGroup
@ -6,7 +6,7 @@ Subject: [PATCH] Implement CraftBlockSoundGroup
diff --git a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java
new file mode 100644
index 00000000..99f99330
index 0000000000..99f99330d0
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java
@@ -0,0 +1,38 @@
@ -49,7 +49,7 @@ index 00000000..99f99330
+ }
+}
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
index c1ff62aa..de438816 100644
index c1ff62aa52..de43881653 100644
--- a/src/main/java/net/minecraft/server/IBlockData.java
+++ b/src/main/java/net/minecraft/server/IBlockData.java
@@ -275,6 +275,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@ -61,7 +61,7 @@ index c1ff62aa..de438816 100644
return this.getBlock().getStepSound(this);
}
diff --git a/src/main/java/net/minecraft/server/SoundEffectType.java b/src/main/java/net/minecraft/server/SoundEffectType.java
index b774d2d8..0184bf3f 100644
index b774d2d8d9..0184bf3fc9 100644
--- a/src/main/java/net/minecraft/server/SoundEffectType.java
+++ b/src/main/java/net/minecraft/server/SoundEffectType.java
@@ -27,10 +27,10 @@ public class SoundEffectType {
@ -96,10 +96,10 @@ index b774d2d8..0184bf3f 100644
return this.D;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 1354d949..aae81867 100644
index ef81c1d3a9..db446c25c4 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -704,4 +704,11 @@ public class CraftBlock implements Block {
@@ -701,4 +701,11 @@ public class CraftBlock implements Block {
AxisAlignedBB aabb = shape.getBoundingBox();
return new BoundingBox(getX() + aabb.minX, getY() + aabb.minY, getZ() + aabb.minZ, getX() + aabb.maxX, getY() + aabb.maxY, getZ() + aabb.maxZ);
}
@ -112,5 +112,5 @@ index 1354d949..aae81867 100644
+ // Paper end
}
--
2.25.1.windows.1
2.26.2

24
Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch
View File

@ -1,4 +1,4 @@
From fcceb8fb63706e669ee329b3cd5dc780332176f9 Mon Sep 17 00:00:00 2001
From 441e488890ea93d9f96f921121eb337757a6935c Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 15 Jun 2019 08:54:33 -0700
Subject: [PATCH] Fix World#isChunkGenerated calls
@ -8,7 +8,7 @@ This patch also adds a chunk status cache on region files (note that
its only purpose is to cache the status on DISK)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 0dd873a5dd..5e4f3612ba 100644
index 6713b7667a..4c9c8e4839 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -28,7 +28,7 @@ public class ChunkProviderServer extends IChunkProvider {
@ -43,7 +43,7 @@ index 0dd873a5dd..5e4f3612ba 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 83bcef7e64..47e074a122 100644
index f54572773c..8e4b3e52cb 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -403,6 +403,17 @@ public class ChunkRegionLoader {
@ -132,7 +132,7 @@ index 3d255b1964..040d4b41ea 100644
public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 18c71609c0..57b1341b5a 100644
index 4682dca9de..405f57874e 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -968,12 +968,62 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -250,7 +250,7 @@ index 6b543f89d4..d37abf2cf3 100644
this.c();
} finally {
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index b3d1bb5fd8..e07ae98540 100644
index 942b7d3239..2f8af42e2a 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -18,7 +18,14 @@ public final class RegionFileCache implements AutoCloseable {
@ -269,7 +269,7 @@ index b3d1bb5fd8..e07ae98540 100644
long i = ChunkCoordIntPair.pair(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ());
RegionFile regionfile = (RegionFile) this.cache.getAndMoveToFirst(i);
@@ -160,7 +167,8 @@ public final class RegionFileCache implements AutoCloseable {
@@ -165,7 +172,8 @@ public final class RegionFileCache implements AutoCloseable {
try {
NBTCompressedStreamTools.a(nbttagcompound, (DataOutput) dataoutputstream);
@ -280,18 +280,18 @@ index b3d1bb5fd8..e07ae98540 100644
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 661a89c5d6..a71bb86508 100644
index 12ba7d1817..4fa16e167c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -18,6 +18,7 @@ import java.util.Objects;
@@ -19,6 +19,7 @@ import java.util.Objects;
import java.util.Random;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
@@ -408,8 +409,22 @@ public class CraftWorld implements World {
import net.minecraft.server.ArraySetSorted;
@@ -410,8 +411,22 @@ public class CraftWorld implements World {
@Override
public boolean isChunkGenerated(int x, int z) {
@ -315,7 +315,7 @@ index 661a89c5d6..a71bb86508 100644
} catch (IOException ex) {
throw new RuntimeException(ex);
}
@@ -521,20 +536,49 @@ public class CraftWorld implements World {
@@ -523,20 +538,49 @@ public class CraftWorld implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
@ -376,5 +376,5 @@ index 661a89c5d6..a71bb86508 100644
@Override
--
2.25.1
2.26.2

44
Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch
View File

@ -1,4 +1,4 @@
From 35ab84aa1f38c79f543ac56e8745919fb3b2bc87 Mon Sep 17 00:00:00 2001
From e486a08f08f4cb5fe6791d889f77889cd4b8c831 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 13 Jul 2019 09:23:10 -0700
Subject: [PATCH] Asynchronous chunk IO and loading
@ -3633,7 +3633,7 @@ index d37abf2cf3..df728e2c0a 100644
}
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index e07ae98540..0f201000f6 100644
index 2f8af42e2a..2b9bf25fbb 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -9,7 +9,7 @@ import java.io.File;
@ -3688,17 +3688,21 @@ index e07ae98540..0f201000f6 100644
return regionfile1;
}
}
@@ -119,7 +136,8 @@ public final class RegionFileCache implements AutoCloseable {
@@ -120,11 +137,12 @@ public final class RegionFileCache implements AutoCloseable {
@Nullable
public NBTTagCompound read(ChunkCoordIntPair chunkcoordintpair) throws IOException {
- RegionFile regionfile = this.getFile(chunkcoordintpair, false); // CraftBukkit
+ RegionFile regionfile = this.getFile(chunkcoordintpair, false, true); // CraftBukkit // Paper
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
- RegionFile regionfile = this.getFile(chunkcoordintpair, true);
+ RegionFile regionfile = this.getFile(chunkcoordintpair, false, true); // Paper
if (regionfile == null) {
return null;
}
// CraftBukkit end
+ try { // Paper
DataInputStream datainputstream = regionfile.a(chunkcoordintpair);
// Paper start
if (regionfile.isOversized(chunkcoordintpair.x, chunkcoordintpair.z)) {
@@ -157,10 +175,14 @@ public final class RegionFileCache implements AutoCloseable {
@@ -162,10 +180,14 @@ public final class RegionFileCache implements AutoCloseable {
}
return nbttagcompound;
@ -3714,7 +3718,7 @@ index e07ae98540..0f201000f6 100644
int attempts = 0; Exception laste = null; while (attempts++ < 5) { try { // Paper
DataOutputStream dataoutputstream = regionfile.c(chunkcoordintpair);
Throwable throwable = null;
@@ -199,9 +221,12 @@ public final class RegionFileCache implements AutoCloseable {
@@ -204,9 +226,12 @@ public final class RegionFileCache implements AutoCloseable {
MinecraftServer.LOGGER.error("Failed to save chunk", laste);
}
// Paper end
@ -3728,15 +3732,19 @@ index e07ae98540..0f201000f6 100644
ObjectIterator objectiterator = this.cache.values().iterator();
while (objectiterator.hasNext()) {
@@ -213,7 +238,7 @@ public final class RegionFileCache implements AutoCloseable {
@@ -216,4 +241,12 @@ public final class RegionFileCache implements AutoCloseable {
}
}
// CraftBukkit start
- public boolean chunkExists(ChunkCoordIntPair pos) throws IOException {
+
+ // CraftBukkit start
+ public synchronized boolean chunkExists(ChunkCoordIntPair pos) throws IOException { // Paper - synchronize
RegionFile regionfile = getFile(pos, true);
return regionfile != null ? regionfile.chunkExists(pos) : false;
+ RegionFile regionfile = getFile(pos, true);
+
+ return regionfile != null ? regionfile.chunkExists(pos) : false;
+ }
+ // CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/RegionFileSection.java b/src/main/java/net/minecraft/server/RegionFileSection.java
index db9f0196bd..a6d8ef5eb4 100644
--- a/src/main/java/net/minecraft/server/RegionFileSection.java
@ -4081,10 +4089,10 @@ index e3913952d9..3db0ad0a46 100644
}
public void removeTicketsForSpawn(int radiusInBlocks, BlockPosition spawn) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a71bb86508..1d275520fb 100644
index 4fa16e167c..94a9a16a88 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -554,22 +554,23 @@ public class CraftWorld implements World {
@@ -556,22 +556,23 @@ public class CraftWorld implements World {
return true;
}
@ -4116,7 +4124,7 @@ index a71bb86508..1d275520fb 100644
// fall through to load
// we do this so we do not re-read the chunk data on disk
@@ -2439,6 +2440,24 @@ public class CraftWorld implements World {
@@ -2445,6 +2446,24 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}

6
Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch
View File

@ -1,4 +1,4 @@
From 26d8d9ebbb97baf05b31891140dcee94e88e4619 Mon Sep 17 00:00:00 2001
From 7dbac71b45319a51ad6f2f33f0616d06ace55f71 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Mon, 19 Aug 2019 01:27:58 +0500
Subject: [PATCH] implement optional per player mob spawns
@ -599,7 +599,7 @@ index ea1117dc86..fe894a68bc 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 82a80e34a5..3d0316e93c 100644
index f375c9507c..fcd887ce30 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -81,6 +81,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -622,7 +622,7 @@ index 82a80e34a5..3d0316e93c 100644
}
// Yes, this doesn't match Vanilla, but it's the best we can do for now.
@@ -1764,6 +1770,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1766,6 +1772,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}

12
Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch
View File

@ -1,14 +1,14 @@
From 06fef9e33f696f66f882239bedd06bbcee8de481 Mon Sep 17 00:00:00 2001
From 0e0519635bb011273b6b66413bfb6fba28109ec2 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Mon, 19 Aug 2019 19:42:35 +0500
Subject: [PATCH] Prevent consuming the wrong itemstack
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index af79b6e3..b098cd6d 100644
index aecd5011cb..24594aa0e9 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2893,10 +2893,13 @@ public abstract class EntityLiving extends Entity {
@@ -2896,10 +2896,13 @@ public abstract class EntityLiving extends Entity {
this.datawatcher.set(EntityLiving.ao, (byte) j);
}
@ -24,7 +24,7 @@ index af79b6e3..b098cd6d 100644
this.activeItem = itemstack;
this.bl = itemstack.k();
if (!this.world.isClientSide) {
@@ -2972,6 +2975,7 @@ public abstract class EntityLiving extends Entity {
@@ -2975,6 +2978,7 @@ public abstract class EntityLiving extends Entity {
this.clearActiveItem();
} else {
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@ -32,7 +32,7 @@ index af79b6e3..b098cd6d 100644
this.b(this.activeItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@@ -3002,8 +3006,8 @@ public abstract class EntityLiving extends Entity {
@@ -3005,8 +3009,8 @@ public abstract class EntityLiving extends Entity {
this.a(this.getRaisedHand(), itemstack);
// CraftBukkit end
this.dH();
@ -44,5 +44,5 @@ index af79b6e3..b098cd6d 100644
}
// Paper end
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch
View File

@ -1,4 +1,4 @@
From f41b0d11f7ecf75465c8eb5bf49317e6dc662202 Mon Sep 17 00:00:00 2001
From e4e41e06f9557a9f8699f3e46a08e0a120153e71 Mon Sep 17 00:00:00 2001
From: wea_ondara <wea_ondara@alpenblock.net>
Date: Thu, 10 Oct 2019 11:29:42 +0200
Subject: [PATCH] Performance improvement for Chunk.getEntities
@ -10,10 +10,10 @@ operation. This patch will reduce the load of plugins which for example
implement custom moblimits and depend on Chunk.getEntities().
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 91f2066b..9cff8b88 100644
index a53bb7295c..3de9b1c594 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -112,14 +112,14 @@ public class CraftChunk implements Chunk {
@@ -111,14 +111,14 @@ public class CraftChunk implements Chunk {
Entity[] entities = new Entity[count];
for (int i = 0; i < 16; i++) {
@ -34,5 +34,5 @@ index 91f2066b..9cff8b88 100644
return entities;
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
View File

@ -1,4 +1,4 @@
From 70408ce2ca2811f5033d66b2c0a510f5b21fd13a Mon Sep 17 00:00:00 2001
From c0665abbedaadecfc037a9aa903dd94e63afdfc1 Mon Sep 17 00:00:00 2001
From: MisterErwin <git@askarian.net>
Date: Wed, 30 Oct 2019 16:57:54 +0100
Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
@ -6,10 +6,10 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1d275520..051506fc 100644
index 94a9a16a88..9e0979c9b3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1846,7 +1846,12 @@ public class CraftWorld implements World {
@@ -1852,7 +1852,12 @@ public class CraftWorld implements World {
height = 9;
}
@ -24,5 +24,5 @@ index 1d275520..051506fc 100644
for (BlockFace dir : faces) {
IBlockData nmsBlock = world.getType(pos.shift(CraftBlock.blockFaceToNotch(dir)));
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch
View File

@ -1,14 +1,14 @@
From 133c407b698373b6d9b5b679aeac485910ea6499 Mon Sep 17 00:00:00 2001
From 7fe03f5de64ce618f775b8ee89da809c162b8ae0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 20 Apr 2019 19:47:34 -0500
Subject: [PATCH] Expose the internal current tick
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0df49581..b9a398bc 100644
index 14cc12d772..e8d3528d51 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2202,5 +2202,10 @@ public final class CraftServer implements Server {
@@ -2203,5 +2203,10 @@ public final class CraftServer implements Server {
}
return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
}
@ -20,5 +20,5 @@ index 0df49581..b9a398bc 100644
// Paper end
}
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
View File

@ -1,14 +1,14 @@
From 70175fafb3d228fa1e3ac420c9fc8199a0374607 Mon Sep 17 00:00:00 2001
From f8b387807bd9af8ee0c20c6771c840d7699cc904 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 9 Oct 2019 21:51:43 -0500
Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 3d0316e9..987303e3 100644
index fcd887ce30..bb10857cf3 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -982,6 +982,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -984,6 +984,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.lastHealthSent = -1.0F;
this.lastFoodSent = -1;
@ -18,7 +18,7 @@ index 3d0316e9..987303e3 100644
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
this.world.getServer().getPluginManager().callEvent(changeEvent);
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 0ccfd8de..01345a62 100644
index 0ccfd8de0f..01345a62b7 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -716,6 +716,8 @@ public abstract class PlayerList {
@ -31,5 +31,5 @@ index 0ccfd8de..01345a62 100644
entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle());
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
View File

@ -1,4 +1,4 @@
From abe0f1c6ac69176ed7035a710b704072175da151 Mon Sep 17 00:00:00 2001
From e548c3e437a9d6a1dc445f9afd2b312b971ba9c8 Mon Sep 17 00:00:00 2001
From: Lukasz Derlatka <toranktto@gmail.com>
Date: Mon, 11 Nov 2019 16:08:13 +0100
Subject: [PATCH] Fix AssertionError when player hand set to empty type
@ -7,10 +7,10 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
Fixes GH-2718
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b098cd6d..6184cced 100644
index 24594aa0e9..aada8d3b08 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1888,6 +1888,7 @@ public abstract class EntityLiving extends Entity {
@@ -1891,6 +1891,7 @@ public abstract class EntityLiving extends Entity {
return this.getEquipment(EnumItemSlot.OFFHAND);
}
@ -19,7 +19,7 @@ index b098cd6d..6184cced 100644
if (enumhand == EnumHand.MAIN_HAND) {
return this.getEquipment(EnumItemSlot.MAINHAND);
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f88bcb29..108377d7 100644
index f00653dfe7..71d045ee00 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1430,6 +1430,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -34,5 +34,5 @@ index f88bcb29..108377d7 100644
}
// CraftBukkit end
--
2.25.1.windows.1
2.26.2

16
Spigot-Server-Patches/0421-Lag-compensate-eating.patch
View File

@ -1,4 +1,4 @@
From 1db8f5989f4e84e49a289b49b080b2347d54bb62 Mon Sep 17 00:00:00 2001
From 826d9e18cd1a733abb0f857568be89ab89bda212 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 14 Jan 2020 15:28:28 -0800
Subject: [PATCH] Lag compensate eating
@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
Change to also use a time check instead if it passes.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6184cced..1b9551ae 100644
index aada8d3b08..252b3c5929 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -113,7 +113,7 @@ public abstract class EntityLiving extends Entity {
@ -19,7 +19,7 @@ index 6184cced..1b9551ae 100644
protected int bm;
private BlockPosition bE;
private DamageSource bF;
@@ -2844,6 +2844,10 @@ public abstract class EntityLiving extends Entity {
@@ -2847,6 +2847,10 @@ public abstract class EntityLiving extends Entity {
return ((Byte) this.datawatcher.get(EntityLiving.ao) & 2) > 0 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND;
}
@ -30,7 +30,7 @@ index 6184cced..1b9551ae 100644
private void o() {
if (this.isHandRaised()) {
if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) {
@@ -2852,7 +2856,14 @@ public abstract class EntityLiving extends Entity {
@@ -2855,7 +2859,14 @@ public abstract class EntityLiving extends Entity {
this.b(this.activeItem, 5);
}
@ -46,7 +46,7 @@ index 6184cced..1b9551ae 100644
this.q();
}
} else {
@@ -2902,7 +2913,10 @@ public abstract class EntityLiving extends Entity {
@@ -2905,7 +2916,10 @@ public abstract class EntityLiving extends Entity {
if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag
this.activeItem = itemstack;
@ -58,7 +58,7 @@ index 6184cced..1b9551ae 100644
if (!this.world.isClientSide) {
this.c(1, true);
this.c(2, enumhand == EnumHand.OFF_HAND);
@@ -2926,7 +2940,10 @@ public abstract class EntityLiving extends Entity {
@@ -2929,7 +2943,10 @@ public abstract class EntityLiving extends Entity {
}
} else if (!this.isHandRaised() && !this.activeItem.isEmpty()) {
this.activeItem = ItemStack.a;
@ -70,7 +70,7 @@ index 6184cced..1b9551ae 100644
}
}
@@ -3048,7 +3065,10 @@ public abstract class EntityLiving extends Entity {
@@ -3051,7 +3068,10 @@ public abstract class EntityLiving extends Entity {
}
this.activeItem = ItemStack.a;
@ -83,5 +83,5 @@ index 6184cced..1b9551ae 100644
public boolean isBlocking() {
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch
View File

@ -1,4 +1,4 @@
From aebdd788ccc9f8e6e89b2c6cf1f8b82e2c2faf68 Mon Sep 17 00:00:00 2001
From c7b8160386ce4c05a0be9779d2af9c9426287626 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 13 May 2016 01:38:06 -0400
Subject: [PATCH] Entity Activation Range 2.0
@ -26,7 +26,7 @@ index a1883eba63..7c6e687707 100644
return this.g.contains(activity);
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0900db052d..57c289bab9 100644
index fd6dad8437..067420f195 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -192,6 +192,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -59,7 +59,7 @@ index 0900db052d..57c289bab9 100644
vec3d = this.a(vec3d, enummovetype);
Vec3D vec3d1 = this.e(vec3d);
@@ -2765,6 +2774,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2767,6 +2776,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.am;
}
@ -111,7 +111,7 @@ index 6d53254f83..5aca7a9131 100644
if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) {
EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle();
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1b9551ae09..158ae4ff68 100644
index 252b3c5929..38f666bb11 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -91,7 +91,7 @@ public abstract class EntityLiving extends Entity {

8
Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch
View File

@ -1,14 +1,14 @@
From ff7245062fb49b58b677be0b9a3c12e785392a97 Mon Sep 17 00:00:00 2001
From 28e6d914ef8c376893cb688b53707f1999aabc2a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 12:25:07 -0600
Subject: [PATCH] Add effect to block break naturally
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index aae81867..a25d9d7a 100644
index db446c25c4..01c524cc01 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -609,12 +609,20 @@ public class CraftBlock implements Block {
@@ -606,12 +606,20 @@ public class CraftBlock implements Block {
@Override
public boolean breakNaturally(ItemStack item) {
@ -30,5 +30,5 @@ index aae81867..a25d9d7a 100644
}
--
2.25.1.windows.1
2.26.2

8
Spigot-Server-Patches/0436-Entity-Jump-API.patch
View File

@ -1,14 +1,14 @@
From 3918cd75001b10cc7c5257f178b1a29fa50f9933 Mon Sep 17 00:00:00 2001
From 09b2d710c63fb8d1af641e7cac1eb4bb9d44c301 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 8 Feb 2020 23:26:11 -0600
Subject: [PATCH] Entity Jump API
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 158ae4ff68..1e6106f2ba 100644
index 38f666bb11..253e35826f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2605,8 +2605,10 @@ public abstract class EntityLiving extends Entity {
@@ -2608,8 +2608,10 @@ public abstract class EntityLiving extends Entity {
} else if (this.aH()) {
this.c(TagsFluid.LAVA);
} else if ((this.onGround || this.N > 0.0D && this.N <= 0.4D) && this.jumpTicks == 0) {
@ -34,7 +34,7 @@ index cd41c80f19..f50ed19080 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 6de01e4f0e..8ffa3cb059 100644
index 7d101d9630..245bd116d1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -723,5 +723,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

10
Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
View File

@ -1,4 +1,4 @@
From cbbb713b9977ebf9c0df1bbc3b8f23112867da14 Mon Sep 17 00:00:00 2001
From bc07d66a6ee5dc72d302c0bbe93e379565625867 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 8 Apr 2020 03:06:30 -0400
Subject: [PATCH] Optimize PlayerChunkMap memory use for visibleChunks
@ -50,7 +50,7 @@ index 0000000000..e0ad725b2e
+ }
+}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 2e63f64783..3d79e756d9 100644
index ca1b5b3b09..c457e3b772 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -750,7 +750,7 @@ public class ChunkProviderServer extends IChunkProvider {
@ -76,7 +76,7 @@ index d9941b38ca..71ab65e00f 100644
List<PlayerChunk> allChunks = new ArrayList<>(visibleChunks.values());
List<EntityPlayer> players = world.players;
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index be75b9dd14..90e4811157 100644
index 7647b804fa..fb7bbe8744 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -55,8 +55,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -213,7 +213,7 @@ index be75b9dd14..90e4811157 100644
while (objectbidirectionaliterator.hasNext()) {
Entry<PlayerChunk> entry = (Entry) objectbidirectionaliterator.next();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 051506fce8..630d6470a4 100644
index 9e0979c9b3..3bce735f88 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -74,6 +74,7 @@ import net.minecraft.server.GameRules;
@ -255,7 +255,7 @@ index 051506fce8..630d6470a4 100644
}
public int getPlayerCount() {
return world.players.size();
@@ -432,6 +436,14 @@ public class CraftWorld implements World {
@@ -434,6 +438,14 @@ public class CraftWorld implements World {
@Override
public Chunk[] getLoadedChunks() {

10
Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
View File

@ -1,4 +1,4 @@
From d920ecb1880d7a257ef02320820c67c10ce19722 Mon Sep 17 00:00:00 2001
From 4871bd47aebe58237761a627e920db06f3efa47c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 8 Apr 2020 21:07:08 -0400
Subject: [PATCH] Don't load chunks when attempting to unload a chunk
@ -6,10 +6,10 @@ Subject: [PATCH] Don't load chunks when attempting to unload a chunk
Big Brain Logic
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 630d6470..1fbb1344 100644
index 3bce735f88..b962dbfdfe 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -471,7 +471,7 @@ public class CraftWorld implements World {
@@ -473,7 +473,7 @@ public class CraftWorld implements World {
@Override
public boolean unloadChunkRequest(int x, int z) {
org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
@ -18,7 +18,7 @@ index 630d6470..1fbb1344 100644
if (chunk != null) {
world.getChunkProvider().removeTicket(TicketType.PLUGIN, chunk.getPos(), 1, Unit.INSTANCE);
}
@@ -481,7 +481,7 @@ public class CraftWorld implements World {
@@ -483,7 +483,7 @@ public class CraftWorld implements World {
private boolean unloadChunk0(int x, int z, boolean save) {
org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
@ -28,5 +28,5 @@ index 630d6470..1fbb1344 100644
return true;
}
--
2.25.1.windows.1
2.26.2

10
Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch
View File

@ -1,4 +1,4 @@
From a1b5e7896867af0ae6ef0cddc1b68e5b7d7981bf Mon Sep 17 00:00:00 2001
From bbe304c80e60c830e3256b169ac709b5d8c490c8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 5 Apr 2020 22:23:14 -0500
Subject: [PATCH] Add tick times API and /mspt command
@ -75,7 +75,7 @@ index 0000000000..d0211d4f39
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 1e186f149c..13d8934508 100644
index 9f1662ece5..e0d7832c3a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -70,6 +70,7 @@ public class PaperConfig {
@ -87,7 +87,7 @@ index 1e186f149c..13d8934508 100644
version = getInt("config-version", 20);
set("config-version", 20);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a1d662f1e3..01534d19d4 100644
index 3c25436f15..5f57a9e1c8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -106,6 +106,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -147,10 +147,10 @@ index a1d662f1e3..01534d19d4 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b9a398bc57..53b71b7915 100644
index e8d3528d51..4a41003203 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2052,6 +2052,16 @@ public final class CraftServer implements Server {
@@ -2053,6 +2053,16 @@ public final class CraftServer implements Server {
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
};
}

8
Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch
View File

@ -1,4 +1,4 @@
From f8911e9e778ab7c9639dde796cdb7e18bbc48034 Mon Sep 17 00:00:00 2001
From aaa228a46eeb34f71d7587cb7220e1dac0afcf75 Mon Sep 17 00:00:00 2001
From: JRoy <joshroy126@gmail.com>
Date: Fri, 10 Apr 2020 21:24:12 -0400
Subject: [PATCH] Expose MinecraftServer#isRunning
@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 53b71b79..8cc0f66c 100644
index 4a41003203..b627180729 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2217,5 +2217,10 @@ public final class CraftServer implements Server {
@@ -2218,5 +2218,10 @@ public final class CraftServer implements Server {
public int getCurrentTick() {
return net.minecraft.server.MinecraftServer.currentTick;
}
@ -21,5 +21,5 @@ index 53b71b79..8cc0f66c 100644
// Paper end
}
--
2.25.1.windows.1
2.26.2

6
Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
View File

@ -1,4 +1,4 @@
From 9c8a19c1cb2ef8705cca05c105227b3ae8cef0ea Mon Sep 17 00:00:00 2001
From b732b943c32cdc2dd199c5846cf85f6cc83bca1f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 11 Apr 2020 21:23:42 -0400
Subject: [PATCH] Delay unsafe actions until after entity ticking is done
@ -44,10 +44,10 @@ index dc01fb494d..d13dc8fce9 100644
try (co.aikar.timings.Timing ignored = this.timings.newEntities.startTiming()) { // Paper - timings
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1fbb1344fc..f56131e3a5 100644
index b962dbfdfe..c9e5330948 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2469,7 +2469,7 @@ public class CraftWorld implements World {
@@ -2475,7 +2475,7 @@ public class CraftWorld implements World {
CompletableFuture<Chunk> ret = new CompletableFuture<>();
this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, (net.minecraft.server.Chunk chunk) -> {

6
Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
View File

@ -1,4 +1,4 @@
From b56a99223d17176e5a002c81e1d49a27f0461e97 Mon Sep 17 00:00:00 2001
From a79d22f5d245994d6a1af90e8b709ab20b3f77a7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 12 Apr 2020 15:50:48 -0400
Subject: [PATCH] Forced Watchdog Crash support and Improve Async Shutdown
@ -223,10 +223,10 @@ index de9f49b884..c8619af2cf 100644
String msg = "Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ();
System.err.println(msg);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8cc0f66ce5..dcc44be613 100644
index b627180729..f49193d9d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1705,7 +1705,7 @@ public final class CraftServer implements Server {
@@ -1706,7 +1706,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {

10
Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch
View File

@ -1,11 +1,11 @@
From bae710173ea9e6a616d329d1c3fe9f152a683f16 Mon Sep 17 00:00:00 2001
From c6294c9875bb5f2211a4e9189379653710c68e51 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 13 Apr 2020 07:31:44 +0100
Subject: [PATCH] Prevent opening inventories when frozen
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d16f3880d5..c3d6447853 100644
index 50886c1374..0c0224d1eb 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -384,7 +384,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -17,7 +17,7 @@ index d16f3880d5..c3d6447853 100644
this.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
this.activeContainer = this.defaultContainer;
}
@@ -1172,7 +1172,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1174,7 +1174,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else {
// CraftBukkit start
this.activeContainer = container;
@ -26,7 +26,7 @@ index d16f3880d5..c3d6447853 100644
// CraftBukkit end
container.addSlotListener(this);
return OptionalInt.of(this.containerCounter);
@@ -1910,7 +1910,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1912,7 +1912,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@Override
@ -36,7 +36,7 @@ index d16f3880d5..c3d6447853 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 1c88eacea9..c5d3eec4f6 100644
index a6d75c0e07..a5e9fc90ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -350,7 +350,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {

8
Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch
View File

@ -1,4 +1,4 @@
From e525208c1cb34b0460e93997d6aed0af5897cf70 Mon Sep 17 00:00:00 2001
From cab3a2fc1109232d67827d3db1f9328c3095de61 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Wed, 15 Apr 2020 17:56:07 -0700
Subject: [PATCH] Don't run entity collision code if not needed
@ -7,10 +7,10 @@ Will not run if max entity craming is disabled and
the max collisions per entity is less than or equal to 0
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ad474500..dfb9421a 100644
index 253e35826f..2c81344a65 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2663,10 +2663,16 @@ public abstract class EntityLiving extends Entity {
@@ -2666,10 +2666,16 @@ public abstract class EntityLiving extends Entity {
protected void doTick() {}
protected void collideNearby() {
@ -29,5 +29,5 @@ index ad474500..dfb9421a 100644
if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) {
--
2.25.1.windows.1
2.26.2

16
Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch
View File

@ -1,4 +1,4 @@
From ace4b62d156c205e0f893b38bfe92d4c16011c10 Mon Sep 17 00:00:00 2001
From d166e9638ad9b6fe12aee5037f72db11e495044f Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Mon, 20 Jan 2020 21:38:15 +0100
Subject: [PATCH] Implement Player Client Options API
@ -6,7 +6,7 @@ Subject: [PATCH] Implement Player Client Options API
diff --git a/src/main/java/com/destroystokyo/paper/PaperSkinParts.java b/src/main/java/com/destroystokyo/paper/PaperSkinParts.java
new file mode 100644
index 00000000..b6f4400d
index 0000000000..b6f4400df3
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/PaperSkinParts.java
@@ -0,0 +1,74 @@
@ -85,7 +85,7 @@ index 00000000..b6f4400d
+ }
+}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 7afcde60..8a3f2b5e 100644
index c4d4334305..7df24be46e 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -35,7 +35,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -98,7 +98,7 @@ index 7afcde60..8a3f2b5e 100644
protected static final DataWatcherObject<NBTTagCompound> bs = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
protected static final DataWatcherObject<NBTTagCompound> bt = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index c59416e1..f3928b8f 100644
index 0c0224d1eb..c108a38018 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -2,6 +2,7 @@ package net.minecraft.server;
@ -118,7 +118,7 @@ index c59416e1..f3928b8f 100644
private long cj = SystemUtils.getMonotonicMillis();
private Entity spectatedEntity; private void setSpectatorTargetField(Entity e) { this.spectatedEntity = e; } // Paper - OBFHELPER
public boolean worldChangeInvuln;
@@ -1575,6 +1576,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1577,6 +1578,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void a(PacketPlayInSettings packetplayinsettings) {
@ -127,7 +127,7 @@ index c59416e1..f3928b8f 100644
if (getMainHand() != packetplayinsettings.getMainHand()) {
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
diff --git a/src/main/java/net/minecraft/server/PacketPlayInSettings.java b/src/main/java/net/minecraft/server/PacketPlayInSettings.java
index 8faebf9e..4da63713 100644
index 8faebf9efe..4da6371381 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInSettings.java
+++ b/src/main/java/net/minecraft/server/PacketPlayInSettings.java
@@ -37,18 +37,22 @@ public class PacketPlayInSettings implements Packet<PacketListenerPlayIn> {
@ -154,7 +154,7 @@ index 8faebf9e..4da63713 100644
return this.e;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 33cac5fc..b76379a1 100644
index e76f2b9c7f..3515b72682 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,8 @@
@ -200,5 +200,5 @@ index 33cac5fc..b76379a1 100644
// Spigot start
--
2.25.1.windows.1
2.26.2

36
Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch
View File

@ -1,26 +1,32 @@
From b0175164c105ef071144d0facc5381c77974ac9d Mon Sep 17 00:00:00 2001
From c747a7f040b85df3dc2461f55587064e691fab9b Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Thu, 26 Mar 2020 19:44:50 -0700
Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 8a3f2b5e..2e186134 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1057,7 +1057,11 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 2c81344a65..3fc2360a10 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1690,7 +1690,17 @@ public abstract class EntityLiving extends Entity {
f *= 0.2F + f2 * f2 * 0.8F;
f1 *= f2;
- this.ey();
EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption);
if (damagesource.getEntity() instanceof EntityHuman) {
- ((EntityHuman) damagesource.getEntity()).ey(); // Moved from EntityHuman in order to make the cooldown reset get called after the damage event is fired
+ // Paper start - PlayerAttackEntityCooldownResetEvent
+ if (new com.destroystokyo.paper.event.player.PlayerAttackEntityCooldownResetEvent((Player) this.getBukkitEntity(), entity.getBukkitEntity(), this.getCooledAttackStrength(0F)).callEvent()) {
+ this.resetCooldown(); // reset it like normal
+ if (damagesource.getEntity() instanceof EntityPlayer) {
+ EntityPlayer player = (EntityPlayer) damagesource.getEntity();
+ if (new com.destroystokyo.paper.event.player.PlayerAttackEntityCooldownResetEvent(player.getBukkitEntity(), this.getBukkitEntity(), player.getCooledAttackStrength(0F)).callEvent()) {
+ player.resetCooldown();
+ }
+ } else {
+ ((EntityHuman) damagesource.getEntity()).resetCooldown();
+ }
+ // Paper end
if (f > 0.0F || f1 > 0.0F) {
boolean flag = f2 > 0.9F;
boolean flag1 = false;
+
}
if (event.isCancelled()) {
return false;
--
2.25.1.windows.1
2.26.2

Some files were not shown because too many files have changed in this diff Show More