Rework PlayerInteractEvent handler for Cauldron compatibility.

In Forge/Vanilla, Notch sends 2 packets when a player uses right-click
aimed at a block. However with Cauldron, we use Grum's CraftBukkit patch
which ignores the second packet as it isn't needed. So with Forge/Vanilla
you will receive 2 PlayerInteractEvents, one for RIGHT_CLICK_BLOCK and one
for RIGHT_CLICK_AIR. With Cauldron you will only receive a
RIGHT_CLICK_BLOCK.

In order to solve the Salt Water Bottle issue when a player aims at a
block in Ocean biome, I have changed the logic to handle both Forge and
Cauldron.