README.md

@@ -1,8 +1,13 @@
-Paper [![Build Status](https://papermc.io/ci/job/Paper/badge/icon)](https://papermc.io/ci/job/Paper/)
+Yesdog Paper [![Build Status](https://travis-ci.org/yesdog/Paper.svg?branch=master)](https://travis-ci.org/yesdog/Paper)
 ===========
 
 High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.
 
+Yesdog Additions:
+* PE stairs/slab/snow collision fix.
+* Alternate mob spawn mechanics.
+* Remove sign patch for now
+
 
 **Support and Project Discussion:**
  - [IRC](http://irc.spi.gt/iris/?channels=paper) or [Discord](https://discord.gg/jETyjUw)

Spigot-Server-Patches/0004-MC-Utils.patch

@@ -1,4 +1,4 @@
-From acf9c715648075076c1438814a611103748ec3a0 Mon Sep 17 00:00:00 2001
+From 92fe4db1e3d4ad1435ad12587ccf2af74c0a515d 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
@@ -277,7 +277,7 @@ index b8abd6363f..a07ee150c2 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 9e763b6e39..a7fc148591 100644
+index 3e9621aea2..6a85fecb79 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -36,10 +36,19 @@ import org.bukkit.event.world.StructureGrowEvent;
@@ -301,7 +301,7 @@ index 9e763b6e39..a7fc148591 100644
      @Deprecated
      private Item item;
      private NBTTagCompound tag;
-@@ -590,6 +599,17 @@ public final class ItemStack {
+@@ -593,6 +602,17 @@ public final class ItemStack {
          return this.tag != null ? this.tag.getList("Enchantments", 10) : new NBTTagList();
      }
 
@@ -319,15 +319,15 @@ index 9e763b6e39..a7fc148591 100644
      public void setTag(@Nullable NBTTagCompound nbttagcompound) {
          this.tag = nbttagcompound;
      }
-@@ -674,6 +694,7 @@ public final class ItemStack {
+@@ -677,6 +697,7 @@ public final class ItemStack {
          return this.tag != null && this.tag.hasKeyOfType("Enchantments", 9) ? !this.tag.getList("Enchantments", 10).isEmpty() : false;
      }
 
 +    public void getOrCreateTagAndSet(String s, NBTBase nbtbase) { a(s, nbtbase);} // Paper - OBFHELPER
      public void a(String s, NBTBase nbtbase) {
          this.getOrCreateTag().set(s, nbtbase);
      }
-@@ -747,6 +768,7 @@ public final class ItemStack {
+@@ -750,6 +771,7 @@ public final class ItemStack {
      // CraftBukkit start
      @Deprecated
      public void setItem(Item item) {

Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch

@@ -1,29 +1,30 @@
-From 66294924c12de6f6629939c1f80582f443480e83 Mon Sep 17 00:00:00 2001
+From bd7b275c123243666ca49a450f3b5e2146f2fedd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5788ec6f6..5ff06d247 100644
+index 20990cbfd..3012580e8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1124,10 +1124,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+@@ -1124,11 +1124,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
          // CraftBukkit start - Use field for loop variable
          co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
          int entitiesThisCycle = 0;
 -        if (tickPosition < 0) tickPosition = 0;
 -        for (entityLimiter.initTick();
 -                entitiesThisCycle < entityList.size() && (entitiesThisCycle % 10 != 0 || entityLimiter.shouldContinue());
 -                tickPosition++, entitiesThisCycle++) {
+-            tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
 +        // Paper start - Disable tick limiters
 +        //if (tickPosition < 0) tickPosition = 0;
 +        for (tickPosition = 0; tickPosition < entityList.size(); tickPosition++) {
 +            // Paper end
-             tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
              entity = (Entity) this.entityList.get(this.tickPosition);
              // CraftBukkit end
-@@ -1191,9 +1191,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+             Entity entity1 = entity.getVehicle();
+@@ -1191,9 +1190,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
          // Spigot start
          // Iterator iterator = this.tileEntityListTick.iterator();
          int tilesThisCycle = 0;
@@ -35,5 +36,5 @@ index 5788ec6f6..5ff06d247 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0056-Add-exception-reporting-event.patch

@@ -1,12 +1,12 @@
-From 0f1c8615e262b38dcdde638ce67cf87eaa8175bb Mon Sep 17 00:00:00 2001
+From d617197c2a04fee2ea3d2884bf00f3a2e5cb609c 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
 
 
 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 0000000000..f699ce18ca
+index 000000000..f699ce18c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 @@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 0000000000..f699ce18ca
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index cb56d067b9..67cd4af4f5 100644
+index cb56d067b..67cd4af4f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -88,7 +88,7 @@ index cb56d067b9..67cd4af4f5 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c2ecc034e8..1ed7c7e2c9 100644
+index c2ecc034e..1ed7c7e2c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -13,6 +13,7 @@ import java.util.concurrent.CompletableFuture;
@@ -119,7 +119,7 @@ index c2ecc034e8..1ed7c7e2c9 100644
 
      }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 09ef8729d9..bf67dbf54a 100644
+index 09ef8729d..bf67dbf54 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -1,5 +1,6 @@
@@ -146,7 +146,7 @@ index 09ef8729d9..bf67dbf54a 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index ab151a14d0..0f1c74dd33 100644
+index ab151a14d..0f1c74dd3 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -1,5 +1,6 @@
@@ -173,7 +173,7 @@ index ab151a14d0..0f1c74dd33 100644
 
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index c5ca896919..e507a996f1 100644
+index c5ca89691..e507a996f 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -1,5 +1,6 @@
@@ -192,7 +192,7 @@ index c5ca896919..e507a996f1 100644
          }
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 6720a9648e..2aa0db5c22 100644
+index 6720a9648..2aa0db5c2 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -10,6 +10,7 @@ import org.apache.logging.log4j.LogManager;
@@ -220,7 +220,7 @@ index 6720a9648e..2aa0db5c22 100644
                              }
 
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 58122b18eb..0ac1fb53a4 100644
+index 58122b18e..0ac1fb53a 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -1,5 +1,7 @@
@@ -240,7 +240,7 @@ index 58122b18eb..0ac1fb53a4 100644
              }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 09cf98ccdd..6e7c0c9da4 100644
+index e6539846b..3714017cc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,6 +1,8 @@
@@ -252,7 +252,7 @@ index 09cf98ccdd..6e7c0c9da4 100644
  import com.google.common.base.MoreObjects;
  import com.google.common.collect.Lists;
  import it.unimi.dsi.fastutil.longs.LongSet;
-@@ -1151,8 +1153,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+@@ -1150,8 +1152,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
                  } catch (Throwable throwable1) {
                      entity.tickTimer.stopTiming();
                      // Paper start - Prevent tile entity and entity crashes
@@ -264,7 +264,7 @@ index 09cf98ccdd..6e7c0c9da4 100644
                      entity.dead = true;
                      continue;
                      // Paper end
-@@ -1217,8 +1221,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+@@ -1216,8 +1220,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
                          this.methodProfiler.exit();
                      } catch (Throwable throwable2) {
                          // Paper start - Prevent tile entity and entity crashes
@@ -277,7 +277,7 @@ index 09cf98ccdd..6e7c0c9da4 100644
                          this.tileEntityListTick.remove(tileTickPosition--);
                          continue;
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index 478bf49976..8d51af2867 100644
+index 478bf4997..8d51af286 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
 @@ -138,6 +138,7 @@ public class WorldPersistentData {
@@ -289,7 +289,7 @@ index 478bf49976..8d51af2867 100644
              throw throwable1;
          } finally {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index d75cc42e11..0e9d5fe3a7 100644
+index d75cc42e1..0e9d5fe3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -17,6 +17,9 @@ import java.util.function.Consumer;

Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch

@@ -1,4 +1,4 @@
-From 08653afb00866b63ce45e73d12eac4be100fe9f9 Mon Sep 17 00:00:00 2001
+From c66fe6923ac746798de73d909fe6c62d8352bd06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index a7fc148591..37d37f1f64 100644
+index 6a85fecb79..d8a5a78bdf 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -61,15 +61,15 @@ index a7fc148591..37d37f1f64 100644
              this.getItem().a(this.tag);
              // CraftBukkit end
          }
-@@ -612,6 +631,7 @@ public final class ItemStack {
+@@ -615,6 +634,7 @@ public final class ItemStack {
      // Paper end
      public void setTag(@Nullable NBTTagCompound nbttagcompound) {
          this.tag = nbttagcompound;
 +        processEnchantOrder(this.tag); // Paper
      }
 
      public IChatBaseComponent getName() {
-@@ -688,6 +708,7 @@ public final class ItemStack {
+@@ -691,6 +711,7 @@ public final class ItemStack {
          nbttagcompound.setString("id", String.valueOf(IRegistry.ENCHANTMENT.getKey(enchantment)));
          nbttagcompound.setShort("lvl", (short) ((byte) i));
          nbttaglist.add((NBTBase) nbttagcompound);

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

@@ -1,4 +1,4 @@
-From e97a654e918381c5b2eb07cf6d632fb55c457fa6 Mon Sep 17 00:00:00 2001
+From c494d0736329d1bb4be277151e34a0bfe64b3341 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
@@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 5843ef65af..4c7793f86d 100644
+index 5843ef65a..4c7793f86 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -31,7 +31,7 @@ index 5843ef65af..4c7793f86d 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 9bb7c9c652..bc364ce371 100644
+index 9bb7c9c65..bc364ce37 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -300,6 +300,16 @@ public class BlockPosition extends BaseBlockPosition {
@@ -52,7 +52,7 @@ index 9bb7c9c652..bc364ce371 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 3f9de7e55a..b76c1579ea 100644
+index 3f9de7e55..b76c1579e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -425,12 +425,24 @@ public class Chunk implements IChunkAccess {
@@ -84,7 +84,7 @@ index 3f9de7e55a..b76c1579ea 100644
              IBlockData iblockdata = null;
 
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 3c5f10ad4d..621ed1fc53 100644
+index 3c5f10ad4..621ed1fc5 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -7,7 +7,7 @@ public class ChunkSection {
@@ -97,7 +97,7 @@ index 3c5f10ad4d..621ed1fc53 100644
      private NibbleArray skyLight;
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fd45090685..f4e91db7c6 100644
+index 160341d6d..69d2f067b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -257,11 +257,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -173,7 +173,7 @@ index fd45090685..f4e91db7c6 100644
              return FluidTypes.EMPTY.i();
          } else {
              Chunk chunk = this.getChunkAtWorldCoords(blockposition);
-@@ -1767,7 +1767,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+@@ -1766,7 +1766,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
      public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
      @Nullable
      public TileEntity getTileEntity(BlockPosition blockposition) {
@@ -182,7 +182,7 @@ index fd45090685..f4e91db7c6 100644
              return null;
          } else {
              // CraftBukkit start
-@@ -1808,7 +1808,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+@@ -1807,7 +1807,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
      }
 
      public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@@ -191,7 +191,7 @@ index fd45090685..f4e91db7c6 100644
              if (tileentity != null && !tileentity.x()) {
                  // CraftBukkit start
                  if (captureBlockStates) {
-@@ -1869,7 +1869,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+@@ -1868,7 +1868,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
      }
 
      public boolean p(BlockPosition blockposition) {

Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From f4e4fe03783d2f79376e0dfb9254d398d1635a2f Mon Sep 17 00:00:00 2001
+From 00c1a50483d196c47548593f019bdd92e1068652 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
@@ -63,10 +63,10 @@ index ee45d3705..01c5d3c57 100644
          }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 34b5ca3a7..8a445a1fa 100644
+index 98f98c35e..dbb00434f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2853,8 +2853,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+@@ -2852,8 +2852,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
          int k = i * 16 + 8 - blockposition.getX();
          int l = j * 16 + 8 - blockposition.getZ();
          boolean flag = true;

Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch

@@ -1,14 +1,14 @@
-From e967f3bcc7b0a00d5282d2a2d5976e1e48107238 Mon Sep 17 00:00:00 2001
+From ae41855e7de88db8a2656b3ebe137344425a0bce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b595536648..5fc2da0d92 100644
+index cf3e9a6c6..be99425bf 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2849,6 +2849,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+@@ -2848,6 +2848,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
          return this.K;
      }
 
@@ -17,7 +17,7 @@ index b595536648..5fc2da0d92 100644
          BlockPosition blockposition = this.getSpawn();
          int k = i * 16 + 8 - blockposition.getX();
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 5e87e537e4..3911e4947e 100644
+index 5e87e537e..3911e4947 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -69,7 +69,7 @@ public abstract class WorldProvider {