Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4a97a7ca Add option to disable pillager patrols (#2626)
23e53aab Backport MC-160177 fix from 1.15 (#2702)
45089d59 Update upstream CB
761c24fa Fix stuck in sneak when changing worlds (MC-10657) (#2627)
This commit is contained in:
William Blake Galbreath
2019-11-24 14:01:05 -06:00
parent cfd297a4c3
commit 84e7469798
42 changed files with 106 additions and 191 deletions

View File

@@ -207,11 +207,6 @@ mobs
- **default**: false
- **description**: Prevent pigmen from targetting players unless they are hit. (fixes MC-56653)
* pillager
* disable-patrols
- **default**: false
- **description**: Disables random pillager patrols (does not effect pillager outposts)
* rabbit
* spawn-killer-rabbit-chance
- **default**: 0.0