Update src/net/dmulloy2/swornrpg/listeners/BlockListener.java

Removes weird conflict