Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-28 14:37:35 +02:00
Code Issues Projects Releases Wiki Activity

More improvements to activation range, improve turtles

Browse Source 
improved the water code so that immunity wont trigger if the entity
has the water pathfinder system active, so this improves support
for all entities that know how to behave in water.

Merged 2 EAR patches together, and removed an MCUtil method that
doesnt have a purpose anymore
This commit is contained in:
Aikar 2018-10-04 23:18:46 -04:00
parent a4df5ddee7
commit 459987d69f
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
232 changed files with 507 additions and 559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Spigot-Server-Patches/0004-MC-Utils.patch
View File

@ -1,11 +1,11 @@
From 9c41b033695b2ef0aaa8f9ba1f6fe6abe50ceb50 Mon Sep 17 00:00:00 2001
From 8521645f1d0a690c7ba90ca59172f9dcec1df615 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:55:47 -0400
Subject: [PATCH] MC Utils
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 6ffc535146..5ed34cf7e3 100644
index 6ffc535146..5c5f19b4b4 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger;
@ -25,7 +25,15 @@ index 6ffc535146..5ed34cf7e3 100644
public BlockPosition a(int ix, int jx, int kx) {
return ix == 0 && jx == 0 && kx == 0 ? this : new BlockPosition(this.getX() + ix, this.getY() + jx, this.getZ() + kx);
}
@@ -282,6 +283,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -186,6 +187,7 @@ public class BlockPosition extends BaseBlockPosition {
};
}
+ public BlockPosition asImmutable() { return h(); } // Paper - OBFHELPER
public BlockPosition h() {
return this;
}
@@ -282,6 +284,7 @@ public class BlockPosition extends BaseBlockPosition {
return this.d;
}
@ -33,7 +41,7 @@ index 6ffc535146..5ed34cf7e3 100644
public BlockPosition.MutableBlockPosition c(int i, int j, int k) {
this.b = i;
this.c = j;
@@ -289,6 +291,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -289,6 +292,7 @@ public class BlockPosition extends BaseBlockPosition {
return this;
}
@ -292,10 +300,10 @@ index c54275bc2f..318c4204df 100644
}
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
new file mode 100644
index 0000000000..faec947224
index 0000000000..c97e116aaf
--- /dev/null
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -0,0 +1,340 @@
@@ -0,0 +1,316 @@
+package net.minecraft.server;
+
+import com.destroystokyo.paper.block.TargetBlockInfo;
@ -552,30 +560,6 @@ index 0000000000..faec947224
+ }
+
+ /**
+ * Gets a chunk without changing its boolean for should unload
+ * @param world
+ * @param x
+ * @param z
+ * @return
+ */
+ @Nullable
+ public static Chunk getLoadedChunkWithoutMarkingActive(World world, int x, int z) {
+ return ((ChunkProviderServer) world.chunkProvider).chunks.get(ChunkCoordIntPair.a(x, z));
+ }
+
+ /**
+ * Gets a chunk without changing its boolean for should unload
+ * @param provider
+ * @param x
+ * @param z
+ * @return
+ */
+ @Nullable
+ public static Chunk getLoadedChunkWithoutMarkingActive(IChunkProvider provider, int x, int z) {
+ return ((ChunkProviderServer)provider).chunks.get(ChunkCoordIntPair.a(x, z));
+ }
+
+ /**
+ * Posts a task to be executed asynchronously
+ * @param run
+ */

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

@ -1,4 +1,4 @@
From c5fa856a9c824a188540888c0224415592fd8c0f Mon Sep 17 00:00:00 2001
From 6c6649b7448fdcb1a1d3235b41294da22a232603 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue
@ -28,7 +28,7 @@ index 145cb274b0..eff9dcf54f 100644
public static Timing getTickList(WorldServer worldserver, String timingsType) {
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 4812da0dac..d0eb7c0fc2 100644
index 6ab2eaa169..27775476f9 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -184,6 +184,11 @@ public class PaperConfig {
@ -61,7 +61,7 @@ index 39d565db1f..8f6f0288be 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index a97f0499cd..397798cf28 100644
index af181d4bd7..4ec5fe739f 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -38,7 +38,7 @@ public class Chunk implements IChunkAccess {
@ -190,7 +190,7 @@ index d6ea4ae532..5086fe4027 100644
}
diff --git a/src/main/java/net/minecraft/server/PaperLightingQueue.java b/src/main/java/net/minecraft/server/PaperLightingQueue.java
new file mode 100644
index 0000000000..bfb05e8766
index 0000000000..d207266db3
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PaperLightingQueue.java
@@ -0,0 +1,99 @@
@ -280,7 +280,7 @@ index 0000000000..bfb05e8766
+ continue;
+ }
+
+ Chunk neighbor = MCUtil.getLoadedChunkWithoutMarkingActive(chunk.world, x, z);
+ Chunk neighbor = chunk.world.getChunkIfLoaded(x, z);
+ if (neighbor != null) {
+ neighbor.lightingQueue.processQueue(0, 0); // No timeout
+ }

8
Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
View File

@ -1,4 +1,4 @@
From ddf05e292f18cdd911fd1360401b33e317016bd3 Mon Sep 17 00:00:00 2001
From 179f3a755d31a07486dddac8aa1e92254fa7cd9b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -31,10 +31,10 @@ index 4048937c63..680764b342 100644
public BaseBlockPosition(int i, int j, int k) {
this.a = i;
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 5ed34cf7e3..f4ed98d2d9 100644
index 5c5f19b4b4..d81e2dc1c5 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -239,6 +239,16 @@ public class BlockPosition extends BaseBlockPosition {
@@ -240,6 +240,16 @@ public class BlockPosition extends BaseBlockPosition {
protected int b;
protected int c;
protected int d;
@ -52,7 +52,7 @@ index 5ed34cf7e3..f4ed98d2d9 100644
public MutableBlockPosition() {
this(0, 0, 0);
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 36def82bca..0e84fd283d 100644
index 38ef8ab6ad..a9c5a0b6f8 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -421,12 +421,24 @@ public class Chunk implements IChunkAccess {

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

@ -1,4 +1,4 @@
From 06c4f9aff700a2985587ebb592453724eaf0852e Mon Sep 17 00:00:00 2001
From 19bc80177637e62f6abf6e8422fb97663e2bd524 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 31 Mar 2016 19:17:58 -0400
Subject: [PATCH] Do not load chunks for light checks
@ -6,6 +6,122 @@ Subject: [PATCH] Do not load chunks for light checks
Should only happen for blocks on the edge that uses neighbors light level
(certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index a8b070ed32..7a4bc0fcc3 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -21,13 +21,15 @@ public abstract class NavigationAbstract {
protected long n;
protected PathfinderAbstract o;
private BlockPosition q;
- private Pathfinder r;
+ private Pathfinder r; public Pathfinder getPathfinder() { return r; } // Paper - OBFHELPER
+ private void setWorld() { if (getPathfinder() != null && getPathfinder().getPathfinder() != null) getPathfinder().getPathfinder().world = getEntity().world; } // Paper
public NavigationAbstract(EntityInsentient entityinsentient, World world) {
this.a = entityinsentient;
this.b = world;
this.p = entityinsentient.getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
this.r = this.a();
+ setWorld(); // Paper
}
public BlockPosition i() {
@@ -164,6 +166,7 @@ public abstract class NavigationAbstract {
}
public void d() {
+ setWorld(); // Paper
++this.e;
if (this.m) {
this.l();
diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
index 04c71ac0ef..6e583356ce 100644
--- a/src/main/java/net/minecraft/server/Pathfinder.java
+++ b/src/main/java/net/minecraft/server/Pathfinder.java
@@ -8,7 +8,7 @@ public class Pathfinder {
private final Path a = new Path();
private final Set<PathPoint> b = Sets.newHashSet();
private final PathPoint[] c = new PathPoint[32];
- private PathfinderAbstract d;
+ private PathfinderAbstract d; public PathfinderAbstract getPathfinder() { return d; } // Paper - OBFHELPER
public Pathfinder(PathfinderAbstract pathfinderabstract) {
this.d = pathfinderabstract;
diff --git a/src/main/java/net/minecraft/server/PathfinderAbstract.java b/src/main/java/net/minecraft/server/PathfinderAbstract.java
index ba7fe359fe..6716280146 100644
--- a/src/main/java/net/minecraft/server/PathfinderAbstract.java
+++ b/src/main/java/net/minecraft/server/PathfinderAbstract.java
@@ -3,6 +3,7 @@ package net.minecraft.server;
public abstract class PathfinderAbstract {
protected IBlockAccess a;
protected EntityInsentient b;
+ public World world; // Paper
protected final IntHashMap<PathPoint> c = new IntHashMap<PathPoint>();
protected int d;
protected int e;
@@ -16,6 +17,7 @@ public abstract class PathfinderAbstract {
public void a(IBlockAccess iblockaccess, EntityInsentient entityinsentient) {
this.a = iblockaccess;
+ if (iblockaccess instanceof World) world = (World) iblockaccess; // Paper
this.b = entityinsentient;
this.c.c();
this.d = MathHelper.d(entityinsentient.width + 1.0F);
diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
index 64e0b08170..93f3d2e363 100644
--- a/src/main/java/net/minecraft/server/PathfinderNormal.java
+++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
@@ -47,7 +47,7 @@ public class PathfinderNormal extends PathfinderAbstract {
BlockPosition blockposition2 = new BlockPosition(this.b);
PathType pathtype1 = this.a(this.b, blockposition2.getX(), i, blockposition2.getZ());
if (this.b.a(pathtype1) < 0.0F) {
- HashSet hashset = Sets.newHashSet();
+ HashSet<BlockPosition> hashset = Sets.newHashSet(); // Paper - decompile fix
hashset.add(new BlockPosition(this.b.getBoundingBox().a, (double)i, this.b.getBoundingBox().c));
hashset.add(new BlockPosition(this.b.getBoundingBox().a, (double)i, this.b.getBoundingBox().f));
hashset.add(new BlockPosition(this.b.getBoundingBox().d, (double)i, this.b.getBoundingBox().c));
@@ -233,7 +233,7 @@ public class PathfinderNormal extends PathfinderAbstract {
}
public PathType a(IBlockAccess iblockaccess, int i, int jx, int k, EntityInsentient entityinsentient, int l, int i1, int j1, boolean flag, boolean flag1) {
- EnumSet enumset = EnumSet.noneOf(PathType.class);
+ EnumSet<PathType> enumset = EnumSet.noneOf(PathType.class); // Paper - decompile fix
PathType pathtype = PathType.BLOCKED;
double d0 = (double)entityinsentient.width / 2.0D;
BlockPosition blockposition = new BlockPosition(entityinsentient);
@@ -304,7 +304,8 @@ public class PathfinderNormal extends PathfinderAbstract {
public PathType a(IBlockAccess iblockaccess, int i, int jx, int k) {
PathType pathtype = this.b(iblockaccess, i, jx, k);
if (pathtype == PathType.OPEN && jx >= 1) {
- Block block = iblockaccess.getType(new BlockPosition(i, jx - 1, k)).getBlock();
+ Block block = world.getBlockIfLoaded(new BlockPosition(i, jx - 1, k)); // Paper
+ if (block == null) return PathType.BLOCKED; // Paper
PathType pathtype1 = this.b(iblockaccess, i, jx - 1, k);
pathtype = pathtype1 != PathType.WALKABLE && pathtype1 != PathType.OPEN && pathtype1 != PathType.WATER && pathtype1 != PathType.LAVA ? PathType.WALKABLE : PathType.OPEN;
if (pathtype1 == PathType.DAMAGE_FIRE || block == Blocks.MAGMA_BLOCK) {
@@ -326,8 +327,9 @@ public class PathfinderNormal extends PathfinderAbstract {
for(int l = -1; l <= 1; ++l) {
for(int i1 = -1; i1 <= 1; ++i1) {
if (l != 0 || i1 != 0) {
- Block block = iblockaccess.getType(blockposition$b.f(l + i, jx, i1 + k)).getBlock();
- if (block == Blocks.CACTUS) {
+ Block block = world.getBlockIfLoaded(blockposition$b.f(l + i, jx, i1 + k)); // Paper
+ if (block == null) pathtype = PathType.BLOCKED; // Paper
+ else if (block == Blocks.CACTUS) { // Paper
pathtype = PathType.DANGER_CACTUS;
} else if (block == Blocks.FIRE) {
pathtype = PathType.DANGER_FIRE;
@@ -343,7 +345,8 @@ public class PathfinderNormal extends PathfinderAbstract {
protected PathType b(IBlockAccess iblockaccess, int i, int jx, int k) {
BlockPosition blockposition = new BlockPosition(i, jx, k);
- IBlockData iblockdata = iblockaccess.getType(blockposition);
+ IBlockData iblockdata = world.getTypeIfLoaded(blockposition); // Paper
+ if (iblockdata == null) return PathType.BLOCKED; // Paper
Block block = iblockdata.getBlock();
Material material = iblockdata.getMaterial();
if (iblockdata.isAir()) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 207f53a9c3..b8fcfb6092 100644
--- a/src/main/java/net/minecraft/server/World.java

95
Spigot-Server-Patches/0161-Activation-Range-Improvements.patch → Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
View File

@ -1,17 +1,19 @@
From 5c8d5740834de57a88322d4bdb1a0fb33831dc29 Mon Sep 17 00:00:00 2001
From 49e4bf33f5be44524fb07c642291336604a8e64e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 27 Dec 2016 22:38:06 -0500
Date: Fri, 13 May 2016 01:38:06 -0400
Subject: [PATCH] Activation Range Improvements
Optimizes performance of Activation Range
Fixes and adds new Immunities to improve gameplay behavior
Adds water Mobs to activation range config and nerfs fish
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index f4ed98d2d9..1dfd71df0a 100644
index d81e2dc1c5..7bd51b3578 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -326,6 +326,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -327,6 +327,7 @@ public class BlockPosition extends BaseBlockPosition {
this.c = i;
}
@ -112,35 +114,52 @@ index 9a75cb63ba..cf10605aaa 100644
}
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f9bb19fed6..d176008f44 100644
index f52de10238..05e10fb366 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -13,13 +13,16 @@ import net.minecraft.server.EntityArrow;
import net.minecraft.server.EntityComplexPart;
import net.minecraft.server.EntityCreature;
@@ -2,6 +2,8 @@ package org.spigotmc;
import java.util.List;
import java.util.Set;
+
+import co.aikar.timings.MinecraftTimings;
import net.minecraft.server.AxisAlignedBB;
import net.minecraft.server.Chunk;
import net.minecraft.server.Entity;
@@ -13,25 +15,29 @@ import net.minecraft.server.EntityCreature;
import net.minecraft.server.EntityCreeper;
+import net.minecraft.server.EntityDrowned;
import net.minecraft.server.EntityEnderCrystal;
import net.minecraft.server.EntityEnderDragon;
import net.minecraft.server.EntityFallingBlock;
-import net.minecraft.server.EntityFallingBlock; // Paper
+import net.minecraft.server.EntityFallingBlock;
import net.minecraft.server.EntityFireball;
import net.minecraft.server.EntityFireworks;
+import net.minecraft.server.EntityFish;
import net.minecraft.server.EntityHuman;
+import net.minecraft.server.EntityInsentient;
import net.minecraft.server.EntityLiving;
+import net.minecraft.server.EntityLlama;
import net.minecraft.server.EntityMonster;
import net.minecraft.server.EntityProjectile;
import net.minecraft.server.EntitySheep;
@@ -27,6 +30,7 @@ import net.minecraft.server.EntitySlime;
-import net.minecraft.server.EntitySlice;
import net.minecraft.server.EntitySlime;
import net.minecraft.server.EntityTNTPrimed;
import net.minecraft.server.EntityThrownTrident;
import net.minecraft.server.EntityVillager;
+import net.minecraft.server.EntityWaterAnimal;
import net.minecraft.server.EntityWeather;
import net.minecraft.server.EntityWither;
import net.minecraft.server.MCUtil;
@@ -40,6 +44,7 @@ public class ActivationRange
+import net.minecraft.server.MCUtil;
import net.minecraft.server.MathHelper;
import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.NavigationGuardian;
import net.minecraft.server.World;
-import co.aikar.timings.MinecraftTimings;
public class ActivationRange
{
@@ -39,6 +45,7 @@ public class ActivationRange
static AxisAlignedBB maxBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
static AxisAlignedBB miscBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
static AxisAlignedBB animalBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
@ -148,7 +167,7 @@ index f9bb19fed6..d176008f44 100644
static AxisAlignedBB monsterBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
/**
@@ -51,6 +56,7 @@ public class ActivationRange
@@ -50,6 +57,7 @@ public class ActivationRange
*/
public static byte initializeEntityActivationType(Entity entity)
{
@ -156,7 +175,7 @@ index f9bb19fed6..d176008f44 100644
if ( entity instanceof EntityMonster || entity instanceof EntitySlime )
{
return 1; // Monster
@@ -75,6 +81,7 @@ public class ActivationRange
@@ -74,6 +82,7 @@ public class ActivationRange
if ( ( entity.activationType == 3 && config.miscActivationRange == 0 )
|| ( entity.activationType == 2 && config.animalActivationRange == 0 )
|| ( entity.activationType == 1 && config.monsterActivationRange == 0 )
@ -164,7 +183,7 @@ index f9bb19fed6..d176008f44 100644
|| entity instanceof EntityHuman
|| entity instanceof EntityProjectile
|| entity instanceof EntityEnderDragon
@@ -106,6 +113,7 @@ public class ActivationRange
@@ -105,11 +114,13 @@ public class ActivationRange
final int miscActivationRange = world.spigotConfig.miscActivationRange;
final int animalActivationRange = world.spigotConfig.animalActivationRange;
final int monsterActivationRange = world.spigotConfig.monsterActivationRange;
@ -172,7 +191,13 @@ index f9bb19fed6..d176008f44 100644
int maxRange = Math.max( monsterActivationRange, animalActivationRange );
maxRange = Math.max( maxRange, miscActivationRange );
@@ -119,6 +127,7 @@ public class ActivationRange
//maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange ); Paper - Use player view distance API below instead
+ Chunk chunk; // Paper
for ( EntityHuman player : world.players )
{
int playerMaxRange = maxRange = Math.min( ( player.getViewDistance() << 4 ) - 8, maxRange ); // Paper - Use player view distance API
@@ -117,6 +128,7 @@ public class ActivationRange
maxBB = player.getBoundingBox().grow( playerMaxRange, 256, playerMaxRange ); // Paper - Use player view distance API
miscBB = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
animalBB = player.getBoundingBox().grow( animalActivationRange, 256, animalActivationRange );
@ -180,7 +205,19 @@ index f9bb19fed6..d176008f44 100644
monsterBB = player.getBoundingBox().grow( monsterActivationRange, 256, monsterActivationRange );
int i = MathHelper.floor( maxBB.a / 16.0D );
@@ -172,6 +181,14 @@ public class ActivationRange
@@ -128,9 +140,9 @@ public class ActivationRange
{
for ( int j1 = k; j1 <= l; ++j1 )
{
- if ( world.getWorld().isChunkLoaded( i1, j1 ) )
+ if ( (chunk = world.getChunkIfLoaded(i1, j1 )) != null ) // Paper
{
- activateChunkEntities( world.getChunkAt( i1, j1 ) );
+ activateChunkEntities( chunk ); // Paper
}
}
}
@@ -170,6 +182,14 @@ public class ActivationRange
entity.activatedTick = MinecraftServer.currentTick;
}
break;
@ -195,22 +232,28 @@ index f9bb19fed6..d176008f44 100644
case 3:
default:
if ( miscBB.c( entity.getBoundingBox() ) )
@@ -193,8 +210,13 @@ public class ActivationRange
@@ -191,11 +211,17 @@ public class ActivationRange
*/
public static boolean checkEntityImmunities(Entity entity)
{
- // quick checks.
- if ( entity.inWater || entity.fireTicks > 0 )
- {
+ // Paper start - optimize Water cases
+ if (entity instanceof EntityFish) {
+ return false;
+ }
// quick checks.
- if ( entity.inWater || entity.fireTicks > 0 )
+ if ( (entity.inWater && (!(entity instanceof EntityWaterAnimal || entity instanceof EntityDrowned))) || entity.fireTicks > 0 )
+ // Paper end
{
+ if ((entity.inWater && entity instanceof EntityInsentient && !(((EntityInsentient) entity).getNavigation() instanceof NavigationGuardian))) {
return true;
}
@@ -212,18 +234,29 @@ public class ActivationRange
+ if (entity.fireTicks > 0) {
+ return true;
+ }
+ // Paper end
if ( !( entity instanceof EntityArrow ) )
{
if ( !entity.onGround || !entity.passengers.isEmpty() || entity.isPassenger() )
@@ -210,18 +236,29 @@ public class ActivationRange
if ( entity instanceof EntityLiving )
{
EntityLiving living = (EntityLiving) entity;
@ -243,7 +286,7 @@ index f9bb19fed6..d176008f44 100644
if ( entity instanceof EntityAnimal )
{
EntityAnimal animal = (EntityAnimal) entity;
@@ -276,10 +309,10 @@ public class ActivationRange
@@ -274,10 +311,10 @@ public class ActivationRange
{
isActive = false;
}

70
Spigot-Server-Patches/0115-Optimize-EAR.patch
View File

@ -1,70 +0,0 @@
From 985660e1b67c134bedf39833962111048d6d395a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 13 May 2016 01:38:06 -0400
Subject: [PATCH] Optimize EAR
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f52de10238..12040596df 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -2,6 +2,8 @@ package org.spigotmc;
import java.util.List;
import java.util.Set;
+
+import co.aikar.timings.MinecraftTimings;
import net.minecraft.server.AxisAlignedBB;
import net.minecraft.server.Chunk;
import net.minecraft.server.Entity;
@@ -13,7 +15,7 @@ import net.minecraft.server.EntityCreature;
import net.minecraft.server.EntityCreeper;
import net.minecraft.server.EntityEnderCrystal;
import net.minecraft.server.EntityEnderDragon;
-import net.minecraft.server.EntityFallingBlock; // Paper
+import net.minecraft.server.EntityFallingBlock;
import net.minecraft.server.EntityFireball;
import net.minecraft.server.EntityFireworks;
import net.minecraft.server.EntityHuman;
@@ -21,17 +23,16 @@ import net.minecraft.server.EntityLiving;
import net.minecraft.server.EntityMonster;
import net.minecraft.server.EntityProjectile;
import net.minecraft.server.EntitySheep;
-import net.minecraft.server.EntitySlice;
import net.minecraft.server.EntitySlime;
import net.minecraft.server.EntityTNTPrimed;
import net.minecraft.server.EntityThrownTrident;
import net.minecraft.server.EntityVillager;
import net.minecraft.server.EntityWeather;
import net.minecraft.server.EntityWither;
+import net.minecraft.server.MCUtil;
import net.minecraft.server.MathHelper;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.World;
-import co.aikar.timings.MinecraftTimings;
public class ActivationRange
{
@@ -110,6 +111,7 @@ public class ActivationRange
maxRange = Math.max( maxRange, miscActivationRange );
//maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange ); Paper - Use player view distance API below instead
+ Chunk chunk; // Paper
for ( EntityHuman player : world.players )
{
int playerMaxRange = maxRange = Math.min( ( player.getViewDistance() << 4 ) - 8, maxRange ); // Paper - Use player view distance API
@@ -128,9 +130,9 @@ public class ActivationRange
{
for ( int j1 = k; j1 <= l; ++j1 )
{
- if ( world.getWorld().isChunkLoaded( i1, j1 ) )
+ if ( (chunk = MCUtil.getLoadedChunkWithoutMarkingActive(world, i1, j1 )) != null ) // Paper
{
- activateChunkEntities( world.getChunkAt( i1, j1 ) );
+ activateChunkEntities( chunk ); // Paper
}
}
}
--
2.19.0

8
Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
View File

@ -1,4 +1,4 @@
From 35769e706c68ba327d1264aacd7cd27c1df767fe Mon Sep 17 00:00:00 2001
From 55ee472e8ef42a126e87749d723842dc3d7e3151 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 23:22:12 -0400
Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@ -43,7 +43,7 @@ index ff1a2046f6..0cd15c17e8 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 41d3aaa80b..824727ec66 100644
index e1c3e19029..bc4d6f127d 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -37,6 +37,7 @@ public class Chunk implements IChunkAccess {
@ -211,10 +211,10 @@ index 72d1a0f51d..3536433d14 100644
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 12040596df..f9bb19fed6 100644
index 05e10fb366..d47a77fdee 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -284,6 +284,11 @@ public class ActivationRange
@@ -319,6 +319,11 @@ public class ActivationRange
{
isActive = false;
}

8
Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch
View File

@ -1,4 +1,4 @@
From d9d01a96e3782d6b0f5911c509b0670c692c9f29 Mon Sep 17 00:00:00 2001
From 6cbf0d8ca037c71d47ed2b79ed80531d56268a38 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 19 Dec 2016 23:07:42 -0500
Subject: [PATCH] Prevent Pathfinding out of World Border
@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
This prevents Entities from trying to run outside of the World Border
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index a8b070ed32..452da80f11 100644
index 7a4bc0fcc3..efdfa7195c 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
@@ -71,6 +71,7 @@ public abstract class NavigationAbstract {
@Nullable
public PathEntity b(BlockPosition blockposition) {
@ -17,7 +17,7 @@ index a8b070ed32..452da80f11 100644
if (!this.b()) {
return null;
} else if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
@@ -93,6 +94,7 @@ public abstract class NavigationAbstract {
@@ -95,6 +96,7 @@ public abstract class NavigationAbstract {
return null;
} else {
BlockPosition blockposition = new BlockPosition(entity);

2
Spigot-Server-Patches/0162-Firework-API-s.patch → Spigot-Server-Patches/0161-Firework-API-s.patch
View File

@ -1,4 +1,4 @@
From 477f25944a48d6758127751c710a055ce38771a5 Mon Sep 17 00:00:00 2001
From 38fd6ea28a3b7560f0ec309f7bfa7ea6571c8655 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 28 Dec 2016 01:18:33 -0500
Subject: [PATCH] Firework API's

2
Spigot-Server-Patches/0163-PlayerTeleportEndGatewayEvent.patch → Spigot-Server-Patches/0162-PlayerTeleportEndGatewayEvent.patch
View File

@ -1,4 +1,4 @@
From 57292e6bc72fced6acb39159d59c17238d9d5635 Mon Sep 17 00:00:00 2001
From f8d41615a68e7ccdf94eff4ab5fe3d84ebb58149 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 31 Dec 2016 21:44:50 -0500
Subject: [PATCH] PlayerTeleportEndGatewayEvent

2
Spigot-Server-Patches/0164-ShulkerBox-Dupe-Prevention.patch → Spigot-Server-Patches/0163-ShulkerBox-Dupe-Prevention.patch
View File

@ -1,4 +1,4 @@
From 0595f09922334f3b66c5ceebbe875990dd4d1117 Mon Sep 17 00:00:00 2001
From e618f0e07ba700822b5535b70b756e9b1c37664a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 2 Jan 2017 16:32:56 -0500
Subject: [PATCH] ShulkerBox Dupe Prevention

2
Spigot-Server-Patches/0165-Provide-E-TE-Chunk-count-stat-methods.patch → Spigot-Server-Patches/0164-Provide-E-TE-Chunk-count-stat-methods.patch
View File

@ -1,4 +1,4 @@
From 112fbc9f04f10cb66099f635f93b8d8baf775402 Mon Sep 17 00:00:00 2001
From 364f74a31e5d72d9a339f77282f85c27db8f59a8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:24:46 -0500
Subject: [PATCH] Provide E/TE/Chunk count stat methods

4
Spigot-Server-Patches/0166-Enforce-Sync-Player-Saves.patch → Spigot-Server-Patches/0165-Enforce-Sync-Player-Saves.patch
View File

@ -1,4 +1,4 @@
From 069e181b2583de1377bd1787e0288c38caa51d53 Mon Sep 17 00:00:00 2001
From 2a263f5083a6f68a1411638b82d48cddf7c608e4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:41:58 -0500
Subject: [PATCH] Enforce Sync Player Saves
@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
the same way we handle async chunk loads.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 7d778ff3..06ce2af1 100644
index 7d778ff3e0..06ce2af1e6 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1215,6 +1215,7 @@ public abstract class PlayerList {

2
Spigot-Server-Patches/0167-Enforce-Sync-Chunk-Unloads.patch → Spigot-Server-Patches/0166-Enforce-Sync-Chunk-Unloads.patch
View File

@ -1,4 +1,4 @@
From 90196edf4705c485d9624b4d3a3b3ad067845ae1 Mon Sep 17 00:00:00 2001
From d470ccd2730c7898a6036ed37307d897ae1c72de Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 16:06:44 -0500
Subject: [PATCH] Enforce Sync Chunk Unloads

2
Spigot-Server-Patches/0168-Don-t-allow-entities-to-ride-themselves-572.patch → Spigot-Server-Patches/0167-Don-t-allow-entities-to-ride-themselves-572.patch
View File

@ -1,4 +1,4 @@
From 6aba3bfbae99d2150d0af1695c5890cb936912b3 Mon Sep 17 00:00:00 2001
From 484e628fd2b20a8cb9e9143b579d0e5d0846c057 Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Sun, 8 Jan 2017 04:31:36 +0000
Subject: [PATCH] Don't allow entities to ride themselves - #572

2
Spigot-Server-Patches/0169-Fix-block-break-desync.patch → Spigot-Server-Patches/0168-Fix-block-break-desync.patch
View File

@ -1,4 +1,4 @@
From 3c6260b482e950db8175272d423b2d301006dcb5 Mon Sep 17 00:00:00 2001
From 4cb8376b3a308bd9466db6835ab58acd7326453f Mon Sep 17 00:00:00 2001
From: Michael Himing <mhiming@gmail.com>
Date: Sun, 8 Jan 2017 18:50:35 +1100
Subject: [PATCH] Fix block break desync

2
Spigot-Server-Patches/0170-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch → Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
View File

@ -1,4 +1,4 @@
From 02a948a5869a2f0667e8024e141347e2fa323502 Mon Sep 17 00:00:00 2001
From c4b3587065b1ea9a389610659cad506f528c5bb5 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

2
Spigot-Server-Patches/0171-Cap-Entity-Collisions.patch → Spigot-Server-Patches/0170-Cap-Entity-Collisions.patch
View File

@ -1,4 +1,4 @@
From d2ad4e7ad54b5fa9fc0120909acb500e68b9fd56 Mon Sep 17 00:00:00 2001
From 0a23e674c29fc0ad5edf834507ae3d01d26f0a5c 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

2
Spigot-Server-Patches/0172-Remove-CraftScheduler-Async-Task-Debugger.patch → Spigot-Server-Patches/0171-Remove-CraftScheduler-Async-Task-Debugger.patch
View File

@ -1,4 +1,4 @@
From 94c6d1da37a9be67ae8745e85952a6269f0d1de6 Mon Sep 17 00:00:00 2001
From 33c49da2b7dbc7302550853833adb693e2a4d438 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

2
Spigot-Server-Patches/0173-Shame-on-you-Mojang.patch → Spigot-Server-Patches/0172-Shame-on-you-Mojang.patch
View File

@ -1,4 +1,4 @@
From 6ee94db8532442e2ab30e3b7cb7739c7cdb7af23 Mon Sep 17 00:00:00 2001
From 8d6e913bba8c42ec058c9bee03f22a2f43b4418f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 5 Feb 2017 19:17:28 -0500
Subject: [PATCH] Shame on you Mojang

2
Spigot-Server-Patches/0174-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch → Spigot-Server-Patches/0173-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
View File

@ -1,4 +1,4 @@
From 281254c055ebd9657dec56034e3c46ed66f2e8e7 Mon Sep 17 00:00:00 2001
From 567b6385af03c95fe786cbd295f1f90437d6c902 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 7 Feb 2017 16:55:35 -0600
Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue

2
Spigot-Server-Patches/0175-Do-not-let-armorstands-drown.patch → Spigot-Server-Patches/0174-Do-not-let-armorstands-drown.patch
View File

@ -1,4 +1,4 @@
From 571465f5f4fdec7f27e5e4ad2af08f9bdf6e406d Mon Sep 17 00:00:00 2001
From d3dc554ffad4b9665f26bc93ad2b45efa06bba9a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 18 Feb 2017 19:29:58 -0600
Subject: [PATCH] Do not let armorstands drown

8
Spigot-Server-Patches/0176-Properly-handle-async-calls-to-restart-the-server.patch → Spigot-Server-Patches/0175-Properly-handle-async-calls-to-restart-the-server.patch
View File

@ -1,4 +1,4 @@
From e95ffc7ab6f240b1bd2c25cef5a931adc5eb0cbd Mon Sep 17 00:00:00 2001
From 9f61283f8da8c7033bc081f086dbaca6bb987824 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 12 May 2017 23:34:11 -0500
Subject: [PATCH] Properly handle async calls to restart the server
@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
in corruption/dataloss.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a547ee5c..8d345a05 100644
index a547ee5ca1..8d345a0502 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -90,6 +90,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -68,7 +68,7 @@ index a547ee5c..8d345a05 100644
private boolean aT() {
return System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 06ce2af1..e61a6387 100644
index 06ce2af1e6..e61a638752 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1333,10 +1333,15 @@ public abstract class PlayerList {
@ -97,7 +97,7 @@ index 06ce2af1..e61a6387 100644
// CraftBukkit start
public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
index 947c43a5..f15fd9f3 100644
index 947c43a5d0..f15fd9f370 100644
--- a/src/main/java/org/spigotmc/RestartCommand.java
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -46,88 +46,123 @@ public class RestartCommand extends Command

2
Spigot-Server-Patches/0177-Add-system-property-to-disable-book-size-limits.patch → Spigot-Server-Patches/0176-Add-system-property-to-disable-book-size-limits.patch
View File

@ -1,4 +1,4 @@
From a5339fccea2bd59e7dff197d710845ab8f08656c Mon Sep 17 00:00:00 2001
From dd36b59cafdc53476976450108b186568f4ad908 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

2
Spigot-Server-Patches/0178-Add-option-to-make-parrots-stay-on-shoulders-despite.patch → Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
View File

@ -1,4 +1,4 @@
From 5ecdf5f97d28a70e5ec06d27e6b054bbcb6176d0 Mon Sep 17 00:00:00 2001
From 8c1fd5cc02bce2bb212187855617f4cd6798d566 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 16 May 2017 21:29:08 -0500
Subject: [PATCH] Add option to make parrots stay on shoulders despite movement

4
Spigot-Server-Patches/0179-Add-configuration-option-to-prevent-player-names-fro.patch → Spigot-Server-Patches/0178-Add-configuration-option-to-prevent-player-names-fro.patch
View File

@ -1,4 +1,4 @@
From e9e83c3e4f20724f7ee11f45ed055452c270f265 Mon Sep 17 00:00:00 2001
From b9afe5d1eebf933d456cfb4f549b62895bacf5b8 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Fri, 9 Jun 2017 07:24:34 -0700
Subject: [PATCH] Add configuration option to prevent player names from being
@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index a848edfc10..ccbe1482fc 100644
index 78dbcb919d..e255d3d1e8 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -275,4 +275,9 @@ public class PaperConfig {

4
Spigot-Server-Patches/0180-Use-TerminalConsoleAppender-for-console-improvements.patch → Spigot-Server-Patches/0179-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -1,4 +1,4 @@
From 5144753ba0ed24d90a493cdd431df8445a2073f4 Mon Sep 17 00:00:00 2001
From 1c34de0ea97c6a691915688da7b8e554c4521217 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
@ -243,7 +243,7 @@ index 8d345a0502..6a3d5fdff4 100644
public KeyPair E() {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a9906f03c9..2f2f301383 100644
index e61a638752..de549d207c 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -78,8 +78,7 @@ public abstract class PlayerList {

2
Spigot-Server-Patches/0181-provide-a-configurable-option-to-disable-creeper-lin.patch → Spigot-Server-Patches/0180-provide-a-configurable-option-to-disable-creeper-lin.patch
View File

@ -1,4 +1,4 @@
From 185c041bc7f55e2b934a831ebaec2d9cd4475a6d Mon Sep 17 00:00:00 2001
From 99b4835e40d1d4ede781bb22ee30b5683d2aff35 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 11 Jun 2017 21:01:18 +0100
Subject: [PATCH] provide a configurable option to disable creeper lingering

2
Spigot-Server-Patches/0182-Item-canEntityPickup.patch → Spigot-Server-Patches/0181-Item-canEntityPickup.patch
View File

@ -1,4 +1,4 @@
From a1ff462154e3c6e97e7a5cd380eb4ae9684aaf5c Mon Sep 17 00:00:00 2001
From 1c7be2d6340c5d04e4ad3990cee743353727952e Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 May 2017 03:57:17 -0500
Subject: [PATCH] Item#canEntityPickup

2
Spigot-Server-Patches/0183-PlayerPickupItemEvent-setFlyAtPlayer.patch → Spigot-Server-Patches/0182-PlayerPickupItemEvent-setFlyAtPlayer.patch
View File

@ -1,4 +1,4 @@
From 883031f68dcfe2e1472f0b7b807d6b8481e0d750 Mon Sep 17 00:00:00 2001
From df7bf328a6c36551758f3a52f2ec36c3a380afb1 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 May 2017 06:26:09 -0500
Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer

2
Spigot-Server-Patches/0184-PlayerAttemptPickupItemEvent.patch → Spigot-Server-Patches/0183-PlayerAttemptPickupItemEvent.patch
View File

@ -1,4 +1,4 @@
From 650a13dedf3acdf0aab3792792e1465f2d3f8c83 Mon Sep 17 00:00:00 2001
From 9c188947d2debdea36e4796d455b317400fb7bd3 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 11 Jun 2017 16:30:30 -0500
Subject: [PATCH] PlayerAttemptPickupItemEvent

2
Spigot-Server-Patches/0185-Add-UnknownCommandEvent.patch → Spigot-Server-Patches/0184-Add-UnknownCommandEvent.patch
View File

@ -1,4 +1,4 @@
From 0890f45cf9facbda79b33156330c681321574888 Mon Sep 17 00:00:00 2001
From 939c395bc7e17a0813aab266f1f4444c0f22ca9d 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

4
Spigot-Server-Patches/0186-Basic-PlayerProfile-API.patch → Spigot-Server-Patches/0185-Basic-PlayerProfile-API.patch
View File

@ -1,4 +1,4 @@
From d3729da16568052185ac4b37a547aa43ed840130 Mon Sep 17 00:00:00 2001
From 84e2ca2bf186beba6ac2aaf2c2546cf2a0def6d6 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
@ -403,7 +403,7 @@ index 0000000000..3aceb0ea8a
+ }
+}
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
index dce1417aff..f7856897f6 100644
index e1af5c4885..0ef5ad1165 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -1,7 +1,10 @@

2
Spigot-Server-Patches/0187-Shoulder-Entities-Release-API.patch → Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch
View File

@ -1,4 +1,4 @@
From cbbed5356c380a5ead3ccc168dc13d08d0953052 Mon Sep 17 00:00:00 2001
From 018559a084e608f3bd6fb7e2c30bf7bbd525f8e1 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

2
Spigot-Server-Patches/0188-Profile-Lookup-Events.patch → Spigot-Server-Patches/0187-Profile-Lookup-Events.patch
View File

@ -1,4 +1,4 @@
From 27f330381e0cab43219fd7c414ca8c9d13383663 Mon Sep 17 00:00:00 2001
From 6bdc6eb94a2982fc5b6c4629c5f3e933908817fe Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 17:00:32 -0400
Subject: [PATCH] Profile Lookup Events

2
Spigot-Server-Patches/0189-Block-player-logins-during-server-shutdown.patch → Spigot-Server-Patches/0188-Block-player-logins-during-server-shutdown.patch
View File

@ -1,4 +1,4 @@
From ab6360e70dead0c0a2753ad324009898e6b9b7f4 Mon Sep 17 00:00:00 2001
From 9ccd366cdf434284ea3d6a8c12d0d0e6e8d60e2f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 2 Jul 2017 21:35:56 -0500
Subject: [PATCH] Block player logins during server shutdown

2
Spigot-Server-Patches/0190-Entity-fromMobSpawner.patch → Spigot-Server-Patches/0189-Entity-fromMobSpawner.patch
View File

@ -1,4 +1,4 @@
From 000e3534b873ef7427de8b5e1b120b57df5f1d45 Mon Sep 17 00:00:00 2001
From e34fd932553d56656b7cf47267297350bf4a4d78 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()

2
Spigot-Server-Patches/0191-Fix-Anvil-Level-sync-to-client.patch → Spigot-Server-Patches/0190-Fix-Anvil-Level-sync-to-client.patch
View File

@ -1,4 +1,4 @@
From a1da8594b29038f7fe5cafca15eef197424d0605 Mon Sep 17 00:00:00 2001
From 979f39c0572758d21860c8724f57f680b4e378c0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 11 Jul 2017 23:17:57 -0400
Subject: [PATCH] Fix Anvil Level sync to client

2
Spigot-Server-Patches/0192-Add-missing-coverages-for-getTileEntity-in-order-to-.patch → Spigot-Server-Patches/0191-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
View File

@ -1,4 +1,4 @@
From fd9f6e2cb6863164a3278578726543c6011140e0 Mon Sep 17 00:00:00 2001
From 27561c26a78ebee8146b8e4f040496bddde42e64 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 22 Jul 2017 15:22:59 +0100
Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt

2
Spigot-Server-Patches/0193-Improve-the-Saddle-API-for-Horses.patch → Spigot-Server-Patches/0192-Improve-the-Saddle-API-for-Horses.patch
View File

@ -1,4 +1,4 @@
From be7705d2b048f5b357227720f7a2d86dcd4dd661 Mon Sep 17 00:00:00 2001
From b024c6904375e8248a5bcdbc6d29d4c9a1f3fcba Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 10 Dec 2016 16:24:06 -0500
Subject: [PATCH] Improve the Saddle API for Horses

2
Spigot-Server-Patches/0194-Implement-ensureServerConversions-API.patch → Spigot-Server-Patches/0193-Implement-ensureServerConversions-API.patch
View File

@ -1,4 +1,4 @@
From 94434ffb86938335fd334e78244ccfe1b088c964 Mon Sep 17 00:00:00 2001
From 995ff17669ecc2be7d3a6b7350ec7d2e4bf7c74c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 22:43:12 -0400
Subject: [PATCH] Implement ensureServerConversions API

2
Spigot-Server-Patches/0195-Implement-getI18NDisplayName.patch → Spigot-Server-Patches/0194-Implement-getI18NDisplayName.patch
View File

@ -1,4 +1,4 @@
From 22fb079adf1464ff5748ede042ce08d3240475d6 Mon Sep 17 00:00:00 2001
From 8793499e5859578ac931eac545c2a87dcfd0b98a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:59:38 -0400
Subject: [PATCH] Implement getI18NDisplayName

2
Spigot-Server-Patches/0196-GH-806-Respect-saving-disabled-before-unloading-all-.patch → Spigot-Server-Patches/0195-GH-806-Respect-saving-disabled-before-unloading-all-.patch
View File

@ -1,4 +1,4 @@
From 57a8cb1f914f889dc4a152de16a47ee1077d1040 Mon Sep 17 00:00:00 2001
From 571545c9c126571aa5ad9c1a9c63baecf61ef5e0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 27 Jul 2017 00:06:43 -0400
Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks

4
Spigot-Server-Patches/0197-ProfileWhitelistVerifyEvent.patch → Spigot-Server-Patches/0196-ProfileWhitelistVerifyEvent.patch
View File

@ -1,11 +1,11 @@
From 356f0298ced084a1e8fb2509ffaef28601ded966 Mon Sep 17 00:00:00 2001
From af4db5029b964c6798b837610a64d2adc9052174 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 3 Jul 2017 18:11:10 -0500
Subject: [PATCH] ProfileWhitelistVerifyEvent
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index de549d20..6bdeb2cc 100644
index de549d207c..6bdeb2cc90 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -544,9 +544,9 @@ public abstract class PlayerList {

2
Spigot-Server-Patches/0198-Fix-this-stupid-bullshit.patch → Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch
View File

@ -1,4 +1,4 @@
From bbc344016aa6a90176f32a59a3e02ddd955ee075 Mon Sep 17 00:00:00 2001
From af6980c50bad0cd035739fcf1e0c39e00f65764a 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

2
Spigot-Server-Patches/0199-Ocelot-despawns-should-honor-nametags-and-leash.patch → Spigot-Server-Patches/0198-Ocelot-despawns-should-honor-nametags-and-leash.patch
View File

@ -1,4 +1,4 @@
From f257ecfad1be7ef00b623cc5c857bffb10641ce4 Mon Sep 17 00:00:00 2001
From 23a07330847d4ddf96a3ba1882668889be0981e5 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 01:54:40 -0500
Subject: [PATCH] Ocelot despawns should honor nametags and leash

2
Spigot-Server-Patches/0200-Reset-spawner-timer-when-spawner-event-is-cancelled.patch → Spigot-Server-Patches/0199-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
View File

@ -1,4 +1,4 @@
From f31a64ff44e550e0fd66df4353a422b0cd7f3387 Mon Sep 17 00:00:00 2001
From 07ceae1ae72511ececf469231511c23d7be7a550 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 01:45:19 -0500
Subject: [PATCH] Reset spawner timer when spawner event is cancelled

2
Spigot-Server-Patches/0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch → Spigot-Server-Patches/0200-Fix-MC-117075-TE-Unload-Lag-Spike.patch
View File

@ -1,4 +1,4 @@
From 05b26d3750481e193a73014ff04a7a41fdefc34c Mon Sep 17 00:00:00 2001
From dfe68b605eafeba30f3fb064ce05d08c96e63349 Mon Sep 17 00:00:00 2001
From: mezz <tehgeek@gmail.com>
Date: Wed, 9 Aug 2017 17:51:22 -0500
Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike

4
Spigot-Server-Patches/0202-Allow-specifying-a-custom-authentication-servers-dow.patch → Spigot-Server-Patches/0201-Allow-specifying-a-custom-authentication-servers-dow.patch
View File

@ -1,4 +1,4 @@
From d2bb273bac11d6ccc8889aa3cfd46298d98f448e Mon Sep 17 00:00:00 2001
From eb0e3b787bb3494aa30cc7ed15dbed3dd1cfc49f Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 17 Aug 2017 16:08:20 -0700
Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index ccbe1482fc..8a899ed40d 100644
index e255d3d1e8..6fcfeafc04 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -1,5 +1,6 @@

2
Spigot-Server-Patches/0203-LivingEntity-setKiller.patch → Spigot-Server-Patches/0202-LivingEntity-setKiller.patch
View File

@ -1,4 +1,4 @@
From bdbd3ab0d4fc6b37c94e8839152eedc1266c57fe Mon Sep 17 00:00:00 2001
From 9c88a6860c9857c1ab2423f6edd26e11d5836772 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 01:49:48 -0500
Subject: [PATCH] LivingEntity#setKiller

2
Spigot-Server-Patches/0204-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch → Spigot-Server-Patches/0203-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
View File

@ -1,4 +1,4 @@
From 726cdd87e6633caf1acbe1d50ba6cb5b36ccf452 Mon Sep 17 00:00:00 2001
From bd9ca6e169ebb2bfa1848f3ca94291a7c0beddc5 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

2
Spigot-Server-Patches/0205-Handle-plugin-prefixes-using-Log4J-configuration.patch → Spigot-Server-Patches/0204-Handle-plugin-prefixes-using-Log4J-configuration.patch
View File

@ -1,4 +1,4 @@
From 2a5a7c0beb6078b743b7793e181bf26d56c03ef2 Mon Sep 17 00:00:00 2001
From 45e1223c049ddcb41d076b94e742adf299b762eb 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

2
Spigot-Server-Patches/0206-Include-Log4J2-SLF4J-implementation.patch → Spigot-Server-Patches/0205-Include-Log4J2-SLF4J-implementation.patch
View File

@ -1,4 +1,4 @@
From 0d0a000ad830d232e3d984de72a359cef23ec164 Mon Sep 17 00:00:00 2001
From 2c68f0bd180e1a053dd2b9e87ff0f4e1d18ca09a 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

2
Spigot-Server-Patches/0207-Disable-logger-prefix-for-various-plugins-bypassing-.patch → Spigot-Server-Patches/0206-Disable-logger-prefix-for-various-plugins-bypassing-.patch
View File

@ -1,4 +1,4 @@
From 4dc90edc20b18809969db18645ee3e127a5d59b5 Mon Sep 17 00:00:00 2001
From 5d4638bf1ac248bb211637ffb67ab6bbc61d4d38 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Sat, 23 Sep 2017 21:07:20 +0200
Subject: [PATCH] Disable logger prefix for various plugins bypassing the

2
Spigot-Server-Patches/0208-Add-PlayerJumpEvent.patch → Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch
View File

@ -1,4 +1,4 @@
From 02d094a81f938886ce698788fe4cbde37b25a640 Mon Sep 17 00:00:00 2001
From 37fc69d96efb51fcf33bdd3bc8923e0d60ccb36a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 Sep 2017 17:21:44 -0400
Subject: [PATCH] Add PlayerJumpEvent

2
Spigot-Server-Patches/0209-handle-PacketPlayInKeepAlive-async.patch → Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch
View File

@ -1,4 +1,4 @@
From 08e897f48e3d2cec25ab1a6bd56db1420eebe6be Mon Sep 17 00:00:00 2001
From 850d1a94bd4ad1eb9df199a1ed4f717d21e13dfd Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 5 Oct 2017 01:54:07 +0100
Subject: [PATCH] handle PacketPlayInKeepAlive async

2
Spigot-Server-Patches/0210-Expose-client-protocol-version-and-virtual-host.patch → Spigot-Server-Patches/0209-Expose-client-protocol-version-and-virtual-host.patch
View File

@ -1,4 +1,4 @@
From 433e260dac80c0e76dc65b0efc2f68313ffaca1d Mon Sep 17 00:00:00 2001
From ca8e4f3b46c8477a1dc8c29f9d9799ae9c012e30 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 10 Oct 2017 18:45:20 +0200
Subject: [PATCH] Expose client protocol version and virtual host

2
Spigot-Server-Patches/0211-revert-serverside-behavior-of-keepalives.patch → Spigot-Server-Patches/0210-revert-serverside-behavior-of-keepalives.patch
View File

@ -1,4 +1,4 @@
From 0d734218b344ed4ab7c2ee8926a50b9b1dc3e2a3 Mon Sep 17 00:00:00 2001
From 064858ed1b41ea7941a517f4307786f75836865a Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 15 Oct 2017 00:29:07 +0100
Subject: [PATCH] revert serverside behavior of keepalives

2
Spigot-Server-Patches/0212-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch → Spigot-Server-Patches/0211-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
View File

@ -1,4 +1,4 @@
From 4655ad979edf64817ec2b39c74440642a7bdf9a2 Mon Sep 17 00:00:00 2001
From 87ff1130c173155c8c30225d7a91e3dd8a56e96e Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Fri, 20 Oct 2017 04:33:45 +0200
Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in

2
Spigot-Server-Patches/0213-Send-attack-SoundEffects-only-to-players-who-can-see.patch → Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch
View File

@ -1,4 +1,4 @@
From 369644a66dc653811818e3ebfadaff639e61c91b Mon Sep 17 00:00:00 2001
From d0a4697ca78a1a3dc06eec3e819e9e4d7dc639c5 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 31 Oct 2017 03:26:18 +0100
Subject: [PATCH] Send attack SoundEffects only to players who can see the

2
Spigot-Server-Patches/0214-Option-for-maximum-exp-value-when-merging-orbs.patch → Spigot-Server-Patches/0213-Option-for-maximum-exp-value-when-merging-orbs.patch
View File

@ -1,4 +1,4 @@
From 63d4774615f8b5359ee87cf4e818d01ec9ff01cc Mon Sep 17 00:00:00 2001
From b32669093d9d7936120b2bdcbcb6d1eb27fe5682 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 10 Nov 2017 23:03:12 -0500
Subject: [PATCH] Option for maximum exp value when merging orbs

2
Spigot-Server-Patches/0215-Add-PlayerArmorChangeEvent.patch → Spigot-Server-Patches/0214-Add-PlayerArmorChangeEvent.patch
View File

@ -1,4 +1,4 @@
From 1efe46f056352cf6f8b11b654093dda41c091ef3 Mon Sep 17 00:00:00 2001
From 0c6ce876938c0eed64a3e2934d4c6395a687a0b1 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

2
Spigot-Server-Patches/0216-Prevent-logins-from-being-processed-when-the-player-.patch → Spigot-Server-Patches/0215-Prevent-logins-from-being-processed-when-the-player-.patch
View File

@ -1,4 +1,4 @@
From 8ead98df2a5d9887a8ac6ac91991b6647044c009 Mon Sep 17 00:00:00 2001
From 6f93bb5e5f2bfb8117f9c93f7797e32d704293d4 Mon Sep 17 00:00:00 2001
From: killme <killme-git@ibts.me>
Date: Sun, 12 Nov 2017 19:40:01 +0100
Subject: [PATCH] Prevent logins from being processed when the player has

2
Spigot-Server-Patches/0217-use-CB-BlockState-implementations-for-captured-block.patch → Spigot-Server-Patches/0216-use-CB-BlockState-implementations-for-captured-block.patch
View File

@ -1,4 +1,4 @@
From 08867a799871fa47b23557ace702cfe77f54374d Mon Sep 17 00:00:00 2001
From ff6e4c55a7fc5a3980d77e8b648537098b3974b7 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 16 Nov 2017 12:12:41 +0000
Subject: [PATCH] use CB BlockState implementations for captured blocks

2
Spigot-Server-Patches/0218-API-to-get-a-BlockState-without-a-snapshot.patch → Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
View File

@ -1,4 +1,4 @@
From b879d5e036766ef649d560aa1cd8ce8bb27834ae Mon Sep 17 00:00:00 2001
From c579bd8a4185d49e669eea46646c157d71201936 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

2
Spigot-Server-Patches/0219-AsyncTabCompleteEvent.patch → Spigot-Server-Patches/0218-AsyncTabCompleteEvent.patch
View File

@ -1,4 +1,4 @@
From 8a9e74f57f7f774225415163916c8f12b6efcb4d Mon Sep 17 00:00:00 2001
From 665e3a64ac739af750b4e417ba0004a8e4b513ce Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 26 Nov 2017 13:19:58 -0500
Subject: [PATCH] AsyncTabCompleteEvent

2
Spigot-Server-Patches/0220-Avoid-NPE-in-PathfinderGoalTempt.patch → Spigot-Server-Patches/0219-Avoid-NPE-in-PathfinderGoalTempt.patch
View File

@ -1,4 +1,4 @@
From ad8dc8010bcf8e45f0c22f4cdd23d18ff626f599 Mon Sep 17 00:00:00 2001
From 3bea380a901c68260b6eaf2225129a68c2e1f882 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 29 Nov 2017 22:18:54 -0500
Subject: [PATCH] Avoid NPE in PathfinderGoalTempt

2
Spigot-Server-Patches/0221-PlayerPickupExperienceEvent.patch → Spigot-Server-Patches/0220-PlayerPickupExperienceEvent.patch
View File

@ -1,4 +1,4 @@
From 7fb904b9bdf314922f45def951681cd51d55a8e7 Mon Sep 17 00:00:00 2001
From ce5a7f73bb7a1d74c0ccd47ad9425dc765b8af3c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 22:02:53 -0500
Subject: [PATCH] PlayerPickupExperienceEvent

2
Spigot-Server-Patches/0222-ExperienceOrbMergeEvent.patch → Spigot-Server-Patches/0221-ExperienceOrbMergeEvent.patch
View File

@ -1,4 +1,4 @@
From bb231385c0c0dfc5181cc942c34aa048093247b7 Mon Sep 17 00:00:00 2001
From 1733fa91a63015f99c127379c07cd56e1397a1ad Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 22:57:26 -0500
Subject: [PATCH] ExperienceOrbMergeEvent

2
Spigot-Server-Patches/0223-Ability-to-apply-mending-to-XP-API.patch → Spigot-Server-Patches/0222-Ability-to-apply-mending-to-XP-API.patch
View File

@ -1,4 +1,4 @@
From 7b29c313c8795d2700da25e279a9377e57a4fe86 Mon Sep 17 00:00:00 2001
From 39b86fa69e8d2d6404b044b90c923f766294834e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Dec 2017 17:36:49 -0500
Subject: [PATCH] Ability to apply mending to XP API

2
Spigot-Server-Patches/0224-Configurable-Chunks-Sends-per-Tick-setting.patch → Spigot-Server-Patches/0223-Configurable-Chunks-Sends-per-Tick-setting.patch
View File

@ -1,4 +1,4 @@
From cfb497b52aa5b4c3620c53fa6db506f5210a4c1f Mon Sep 17 00:00:00 2001
From 2d9f35af04abffc9bf46670bf90fae53bc5c00bd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 1 Jan 2018 15:41:59 -0500
Subject: [PATCH] Configurable Chunks Sends per Tick setting

4
Spigot-Server-Patches/0225-Configurable-Max-Chunk-Gens-per-Tick.patch → Spigot-Server-Patches/0224-Configurable-Max-Chunk-Gens-per-Tick.patch
View File

@ -1,4 +1,4 @@
From 4ea0d21a910e0b43daefd58d3f4c477d9ca703fa Mon Sep 17 00:00:00 2001
From 5f31238e22a6ca4da573ae75fb09824ab8a6aca5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 1 Jan 2018 16:10:24 -0500
Subject: [PATCH] Configurable Max Chunk Gens per Tick
@ -33,7 +33,7 @@ index af69342e6c..ca7efc9175 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
index abf5a7554d..84896d6f6b 100644
index 2fd8fa30ee..a0fcac3296 100644
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -28,6 +28,7 @@ public class PlayerChunk {

2
Spigot-Server-Patches/0226-Make-max-squid-spawn-height-configurable.patch → Spigot-Server-Patches/0225-Make-max-squid-spawn-height-configurable.patch
View File

@ -1,4 +1,4 @@
From 5b13362be9a779df6b65026f72995bf5ba0a668d Mon Sep 17 00:00:00 2001
From b772743743a4424318eec7d23057069599ac64a8 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 11 Jan 2018 16:47:28 -0600
Subject: [PATCH] Make max squid spawn height configurable

2
Spigot-Server-Patches/0227-PreCreatureSpawnEvent.patch → Spigot-Server-Patches/0226-PreCreatureSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From 50a7ddacc14cd3f3cfbdd0b9639f5575b510c846 Mon Sep 17 00:00:00 2001
From 83b5a86c5de9a3f9ea95ae34a473f739224c0ee8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 14 Jan 2018 17:01:31 -0500
Subject: [PATCH] PreCreatureSpawnEvent

2
Spigot-Server-Patches/0228-PlayerNaturallySpawnCreaturesEvent.patch → Spigot-Server-Patches/0227-PlayerNaturallySpawnCreaturesEvent.patch
View File

@ -1,4 +1,4 @@
From 8a4ee53008156f1eaed8961fce5e60db18c6585a Mon Sep 17 00:00:00 2001
From c2e105f84b7417ae201d9c23ccc2b819aa0dfa48 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 14 Jan 2018 17:36:02 -0500
Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent

2
Spigot-Server-Patches/0229-Add-setPlayerProfile-API-for-Skulls.patch → Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
View File

@ -1,4 +1,4 @@
From ff7609807c3c69ad099fb67cc7fde75494090a99 Mon Sep 17 00:00:00 2001
From 9a871f17c9a198eb5bc9b74e789ea310e2fca616 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 19 Jan 2018 00:36:25 -0500
Subject: [PATCH] Add setPlayerProfile API for Skulls

2
Spigot-Server-Patches/0230-Fill-Profile-Property-Events.patch → Spigot-Server-Patches/0229-Fill-Profile-Property-Events.patch
View File

@ -1,4 +1,4 @@
From 8ec62ae1e5fe8a645abf7703443d7fe17aa23ecc Mon Sep 17 00:00:00 2001
From 94844222be50f102f30ea65c4705d15e004b5530 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 2 Jan 2018 00:31:26 -0500
Subject: [PATCH] Fill Profile Property Events

2
Spigot-Server-Patches/0231-PlayerAdvancementCriterionGrantEvent.patch → Spigot-Server-Patches/0230-PlayerAdvancementCriterionGrantEvent.patch
View File

@ -1,4 +1,4 @@
From 49980e61fc954682da770bdb4ba9d78c79e8c3d1 Mon Sep 17 00:00:00 2001
From f7db7b5bf402cd0f61de0918d6e5b1b66763f1b8 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 19 Jan 2018 08:15:29 -0600
Subject: [PATCH] PlayerAdvancementCriterionGrantEvent

2
Spigot-Server-Patches/0232-Add-ArmorStand-Item-Meta.patch → Spigot-Server-Patches/0231-Add-ArmorStand-Item-Meta.patch
View File

@ -1,4 +1,4 @@
From 3d7b2fb8559f4b7e9a77cc5bf847fbbaa018975f Mon Sep 17 00:00:00 2001
From 7034e1b56e73ac61baa240bc969cf857f48f7fb7 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 27 Jan 2018 17:04:14 -0500
Subject: [PATCH] Add ArmorStand Item Meta

2
Spigot-Server-Patches/0233-Extend-Player-Interact-cancellation.patch → Spigot-Server-Patches/0232-Extend-Player-Interact-cancellation.patch
View File

@ -1,4 +1,4 @@
From ec15754c56022bd014cd5c6feb1380c4fb325b18 Mon Sep 17 00:00:00 2001
From 325016cc7a982f737cea5fc4368000ccf7e30564 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 11 Feb 2018 10:43:46 +0000
Subject: [PATCH] Extend Player Interact cancellation

2
Spigot-Server-Patches/0234-Tameable-getOwnerUniqueId-API.patch → Spigot-Server-Patches/0233-Tameable-getOwnerUniqueId-API.patch
View File

@ -1,4 +1,4 @@
From 5b5466728902e005d72d2f8e51d87b6973e89008 Mon Sep 17 00:00:00 2001
From 0caca786108d71c213532dbb058efd5f5bb3a771 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

2
Spigot-Server-Patches/0235-Toggleable-player-crits-helps-mitigate-hacked-client.patch → Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch
View File

@ -1,4 +1,4 @@
From d3908c2872249433b4ffadda9f2c35cdd851a133 Mon Sep 17 00:00:00 2001
From b5fe5cfedb0892d65579588e47cd426c64b85dae Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Sat, 10 Mar 2018 00:50:24 +0100
Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.

2
Spigot-Server-Patches/0236-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch → Spigot-Server-Patches/0235-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
View File

@ -1,4 +1,4 @@
From 4d8116a77923aebfa7d45af006b2dc0c4bf9babf Mon Sep 17 00:00:00 2001
From 7ecd398e6b9b995538cc6c56cfe1cd5a605dd523 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 10 Mar 2018 13:03:49 +0000
Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened

2
Spigot-Server-Patches/0237-Prevent-Frosted-Ice-from-loading-holding-chunks.patch → Spigot-Server-Patches/0236-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
View File

@ -1,4 +1,4 @@
From a545c755665ffec6dbea81ab36f0245be40806d6 Mon Sep 17 00:00:00 2001
From 0337ec68f7397efe5c6599cb488ae42952f290a8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 10 Mar 2018 16:33:15 -0500
Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks

2
Spigot-Server-Patches/0238-Disable-Explicit-Network-Manager-Flushing.patch → Spigot-Server-Patches/0237-Disable-Explicit-Network-Manager-Flushing.patch
View File

@ -1,4 +1,4 @@
From 282ddad68b63ce73482aaad7d34013853af32289 Mon Sep 17 00:00:00 2001
From 1bbdbfeadb10437782ff1ed24a4a09db0d8e52db Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 11 Mar 2018 14:13:33 -0400
Subject: [PATCH] Disable Explicit Network Manager Flushing

2
Spigot-Server-Patches/0239-Implement-extended-PaperServerListPingEvent.patch → Spigot-Server-Patches/0238-Implement-extended-PaperServerListPingEvent.patch
View File

@ -1,4 +1,4 @@
From 77f8535b9c4b4ef7d24b8f23cb19d68624346542 Mon Sep 17 00:00:00 2001
From e5b9baa3179e567e8d031ea4c5bce99b8efefaf9 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Wed, 11 Oct 2017 15:56:26 +0200
Subject: [PATCH] Implement extended PaperServerListPingEvent

2
Spigot-Server-Patches/0240-Improved-Async-Task-Scheduler.patch → Spigot-Server-Patches/0239-Improved-Async-Task-Scheduler.patch
View File

@ -1,4 +1,4 @@
From a15b5ec480aba287c3bda0cd06aa871a47746471 Mon Sep 17 00:00:00 2001
From 219b0871a8f1b93075b7ca410a4663b67771ee1c 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

2
Spigot-Server-Patches/0241-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch → Spigot-Server-Patches/0240-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
View File

@ -1,4 +1,4 @@
From 5c2d7d6ffe3b1b05b007b7e66c4b4831b8039d25 Mon Sep 17 00:00:00 2001
From 982c19767d50214ca6c84babe208d483ddcb5e4e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 11:45:57 -0400
Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent

2
Spigot-Server-Patches/0242-Call-PortalCreateEvent-for-exit-portals.patch → Spigot-Server-Patches/0241-Call-PortalCreateEvent-for-exit-portals.patch
View File

@ -1,4 +1,4 @@
From 0c86471b4b20265927a4b60e646b6d2a8a36a167 Mon Sep 17 00:00:00 2001
From 8031e2f0a6c2736b55d5e96c527b6cf080b88d74 Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Sun, 18 Mar 2018 15:44:44 +0100
Subject: [PATCH] Call PortalCreateEvent for exit portals

2
Spigot-Server-Patches/0243-Player.setPlayerProfile-API.patch → Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch
View File

@ -1,4 +1,4 @@
From 9361263d0896b5fb7e856d7db593d8109a61f696 Mon Sep 17 00:00:00 2001
From aa252e29df89602af7e487e33e63fb46ff9a77a0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 12:29:48 -0400
Subject: [PATCH] Player.setPlayerProfile API

2
Spigot-Server-Patches/0244-Fix-Dragon-Server-Crashes.patch → Spigot-Server-Patches/0243-Fix-Dragon-Server-Crashes.patch
View File

@ -1,4 +1,4 @@
From 1ab4d56fede934397f12f3adad702a38a51ec536 Mon Sep 17 00:00:00 2001
From 83b8bb51552c5b1ffd6509c9f9d6b46a747f6a2c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 21 Mar 2018 20:52:07 -0400
Subject: [PATCH] Fix Dragon Server Crashes

2
Spigot-Server-Patches/0245-getPlayerUniqueId-API.patch → Spigot-Server-Patches/0244-getPlayerUniqueId-API.patch
View File

@ -1,4 +1,4 @@
From debc7e10b92212db182c021c52b819143e511c45 Mon Sep 17 00:00:00 2001
From 30bd8cf126f419185caa6520eca498e877c4b0ce 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

4
Spigot-Server-Patches/0246-Make-player-data-saving-configurable.patch → Spigot-Server-Patches/0245-Make-player-data-saving-configurable.patch
View File

@ -1,11 +1,11 @@
From 9a4c167b01c3c4a4e896574bf45366a11095644a Mon Sep 17 00:00:00 2001
From 3963a8afce003d4c78d10807a75dfa6f3a1d6497 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Mon, 26 Mar 2018 18:30:53 +0300
Subject: [PATCH] Make player data saving configurable
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 8a899ed40d..8b347a9b47 100644
index 6fcfeafc04..f9ad4f97ec 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -286,4 +286,13 @@ public class PaperConfig {

2
Spigot-Server-Patches/0247-Make-legacy-ping-handler-more-reliable.patch → Spigot-Server-Patches/0246-Make-legacy-ping-handler-more-reliable.patch
View File

@ -1,4 +1,4 @@
From f1dd4093f4e8f7d7ac4e82b2eb972e830913bf95 Mon Sep 17 00:00:00 2001
From 03f5df321e1299135fb47f7febb879bb492a9dfb Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Wed, 11 Oct 2017 18:22:50 +0200
Subject: [PATCH] Make legacy ping handler more reliable

2
Spigot-Server-Patches/0248-Call-PaperServerListPingEvent-for-legacy-pings.patch → Spigot-Server-Patches/0247-Call-PaperServerListPingEvent-for-legacy-pings.patch
View File

@ -1,4 +1,4 @@
From df020f38cbecc35e57d92f1a528e3456e9e0e6be Mon Sep 17 00:00:00 2001
From 51238ebbbbd3fa77c730204f46bb3bee2db0cd15 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Wed, 11 Oct 2017 19:30:51 +0200
Subject: [PATCH] Call PaperServerListPingEvent for legacy pings

2
Spigot-Server-Patches/0249-Flag-to-disable-the-channel-limit.patch → Spigot-Server-Patches/0248-Flag-to-disable-the-channel-limit.patch
View File

@ -1,4 +1,4 @@
From 8f142191160c0c153d273f2ef8056c2ede7fa78d Mon Sep 17 00:00:00 2001
From beeb06397df382083e4ce46067bffe583ad595ba Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 31 Mar 2018 17:04:26 +0100
Subject: [PATCH] Flag to disable the channel limit

2
Spigot-Server-Patches/0250-Add-method-to-open-already-placed-sign.patch → Spigot-Server-Patches/0249-Add-method-to-open-already-placed-sign.patch
View File

@ -1,4 +1,4 @@
From 7814c18d81fd97bc562371ba48bf5bff1be6dadb Mon Sep 17 00:00:00 2001
From d10e4e52c21070aa77e423b03a65302e5ca17f9d 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

2
Spigot-Server-Patches/0251-Load-version-history-at-server-start.patch → Spigot-Server-Patches/0250-Load-version-history-at-server-start.patch
View File

@ -1,4 +1,4 @@
From ddf5a46a4f3f712a6ba773d837ea86e3946ebcfd Mon Sep 17 00:00:00 2001
From 1636fc154af5dadcd9d9ee7950506ceb41e0e973 Mon Sep 17 00:00:00 2001
From: Kyle Wood <demonwav@gmail.com>
Date: Thu, 1 Mar 2018 19:38:14 -0600
Subject: [PATCH] Load version history at server start

2
Spigot-Server-Patches/0252-Configurable-sprint-interruption-on-attack.patch → Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
View File

@ -1,4 +1,4 @@
From b80c14207336e5a32b4693e8d6a338438c645468 Mon Sep 17 00:00:00 2001
From ab27cd2f822ead83bcbb5e058b2dd23b2d0942d1 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Sat, 14 Apr 2018 20:20:46 +0200
Subject: [PATCH] Configurable sprint interruption on attack

2
Spigot-Server-Patches/0253-Fix-exploit-that-allowed-colored-signs-to-be-created.patch → Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
View File

@ -1,4 +1,4 @@
From d83b434f71dac05dad84c2de38e1e185a7d41e77 Mon Sep 17 00:00:00 2001
From 7ecdd7ff4e17135f5184695dcde3abb7017b6ea7 Mon Sep 17 00:00:00 2001
From: 0x22 <0x22@futureclient.net>
Date: Thu, 26 Apr 2018 04:41:11 -0400
Subject: [PATCH] Fix exploit that allowed colored signs to be created

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