Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers

This commit is contained in:
Florian Nücke 2014-08-09 00:11:44 +02:00
commit d71efdfbb8

View File

@ -17,12 +17,23 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action
import net.minecraftforge.event.entity.player.{PlayerDestroyItemEvent, PlayerInteractEvent}
object EventHandler {
private var currentlyPlacing = false
@ForgeSubscribe
def playerInteract(event: PlayerInteractEvent) {
val player = event.entityPlayer
if (event.action == Action.RIGHT_CLICK_BLOCK && player.getEntityWorld.isRemote) {
if (place(player)) {
event.setCanceled(true)
this.synchronized {
if (currentlyPlacing) return
try {
currentlyPlacing = true
val player = event.entityPlayer
if (event.action == Action.RIGHT_CLICK_BLOCK && player.getEntityWorld.isRemote) {
if (place(player)) {
event.setCanceled(true)
}
}
}
finally {
currentlyPlacing = false
}
}
}