Upstate upstream B/CB

--- work/Bukkit
Submodule work/Bukkit 9a793cce8..0c1d258bb:
  > Make PigZapEvent extend EntityTransformEvent

--- work/CraftBukkit
Submodule work/CraftBukkit ee6684bba..6a398ac44:
  > SPIGOT-4511: Trident doesn't lose durability
  > Tweak outdated windows
This commit is contained in:
Zach Brown 2018-12-02 18:31:09 -05:00
parent 0c74d4575c
commit 684bd2adbc
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
68 changed files with 250 additions and 287 deletions

@ -1 +1 @@
Subproject commit 9a793cce8c9257ce85069c531486f369ad6328f1
Subproject commit 0c1d258bb8185c39ce12c816a826973e94939b0e

@ -1 +1 @@
Subproject commit ee6684bba725a6d2f30422ae01041f3949ff2d76
Subproject commit 6a398ac443ac411c2e1723eb9aaa1a38792c7645