core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/work/pre-source-patches
History
Zach Brown ef170ee659
Update upstream B/CB/S 
--- work/Bukkit
Submodule work/Bukkit 6eac6d70..1ef8b9d9:
  > Add Player#openBook(ItemStack) method

--- work/CraftBukkit
Submodule work/CraftBukkit 17543ecf..649921e5:
  > Add Player#openBook(ItemStack) method
  > SPIGOT-2000: Picking up items to shield slot working inconsistently when inventory is full
  > SPIGOT-5037: Player.openMerchant does not show merchant level
  > SPIGOT-5038: Inventory.getHolder returns null for wandering traders

--- work/Spigot
Submodule work/Spigot baafee91..df0eb250:
  > SPIGOT-5043: Desync if world is changed in PlayerSpawnLocationEvent
  > Rebuild patches

Implementation developer note:
This patch adds a "pre-source" patch system for fixing malformed patches
from upstream directly. This seems to keep happening so it's best we
have some way to deal with them. This system brings those issues into
our domain rather than needing to wait for upstream to fix their
malformed files.
 		2019-06-08 15:33:05 -05:00
..
Fix-EntityItem-hunks.patch Update upstream B/CB/S 2019-06-08 15:33:05 -05:00
Fix-PlayerInventory-file.patch Update upstream B/CB/S 2019-06-08 15:33:05 -05:00
README.md Update upstream B/CB/S 2019-06-08 15:33:05 -05:00

README.md

Files in this directory are applied directly to the tree before any other patches.

These patches are always applied directly from the root of the repository. "$basedir"

This allows us to fix malformed patch files and other changes from upstream. This is not intended to replace any other system and should not be used in place of the existing specific patch directories.

Documentation is intentionally sparse to avoid being misused.

diff -ruN originalfile changedfile

See the man pages on diff and patch.