Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-08-13 21:53:15 -05:00
commit f524ffb093

View File

@ -91,7 +91,8 @@ public class Dragon extends DragonMount
@EventHandler
public void DragonTargetCancel(EntityTargetEvent event)
{
event.setCancelled(true);
if (GetActive().containsValue(event.getEntity()))
event.setCancelled(true);
}
public void SetName(String news)