Adding events on top of vanilla Minecraft code always requires large // CraftBukkit blocks. This is just the fact of the matter. Minimal diffs don't excuse the code being blatantly wrong. YLivay seems to be doing it correctly here, though I haven't looked at the code in detail.