diff options
| author | Aikar <[email protected]> | 2020-04-02 17:07:06 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-04-02 17:09:17 -0400 |
| commit | e4d10a6d67fe8f01085bd0b112b0c06f0664d359 (patch) | |
| tree | e41863f040107902641a673c4f32bb5fd1cbb1e7 /scripts | |
| parent | c867045d3c29c8fcab69143911a24d98d58d50bc (diff) | |
| download | Paper-e4d10a6d67fe8f01085bd0b112b0c06f0664d359.tar.gz Paper-e4d10a6d67fe8f01085bd0b112b0c06f0664d359.zip | |
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches
a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType()
CraftBukkit Changes:
bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException
3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches
95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType()
4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/upstreamMerge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/upstreamMerge.sh b/scripts/upstreamMerge.sh index d59a8b442d..cacfb8dec6 100755 --- a/scripts/upstreamMerge.sh +++ b/scripts/upstreamMerge.sh @@ -16,7 +16,7 @@ function update { $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master refRemote=$(git rev-parse HEAD) cd ../ - $gitcmd add $1 + $gitcmd add $1 -f refHEAD=$(getRef HEAD "$workdir/$1") echo "$1 $refHEAD - $refRemote" if [ "$refHEAD" != "$refRemote" ]; then |