Merge branch 'master' of github.com:sk89q/commandhelper

Author: LadyCailin

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitConvertor.java

@@ -52,13 +52,15 @@
 import com.laytonsmith.abstraction.enums.MCPatternShape;
 import com.laytonsmith.abstraction.enums.MCRecipeType;
 import com.laytonsmith.abstraction.enums.MCTone;
+import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCDyeColor;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCEntityType;
 import com.laytonsmith.abstraction.enums.bukkit.BukkitMCPatternShape;
 import com.laytonsmith.annotations.convert;
 import com.laytonsmith.commandhelper.CommandHelperPlugin;
 import com.laytonsmith.core.CHLog;
 import com.laytonsmith.core.LogLevel;
+import com.laytonsmith.core.Static;
 import com.laytonsmith.core.constructs.Target;
 import com.laytonsmith.core.environments.CommandHelperEnvironment;
 import com.laytonsmith.core.environments.Environment;
@@ -419,7 +421,7 @@ public List<MCEntity> GetEntitiesAt(MCLocation location, double radius) {
 	}
 
 	public static MCItemMeta BukkitGetCorrectMeta(ItemMeta im) {
-		if (im instanceof BannerMeta) {
+		if (Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_8) && im instanceof BannerMeta) {
 			return new BukkitMCBannerMeta((BannerMeta) im);
 		}
 		if (im instanceof BookMeta) {

src/main/java/com/laytonsmith/core/events/drivers/EntityEvents.java

@@ -14,6 +14,7 @@
 import com.laytonsmith.abstraction.MCWorld;
 import com.laytonsmith.abstraction.blocks.MCBlock;
 import com.laytonsmith.abstraction.blocks.MCBlockProjectileSource;
+import com.laytonsmith.abstraction.enums.MCDamageCause;
 import com.laytonsmith.abstraction.enums.MCMobs;
 import com.laytonsmith.abstraction.enums.MCRemoveCause;
 import com.laytonsmith.abstraction.enums.MCSpawnReason;
@@ -730,7 +731,8 @@ public String getName() {
 
 		@Override
 		public String docs() {
-			return "{id: <macro> The entityID | type: <macro> The type of entity being damaged | cause: <macro>"
+			return "{id: <macro> The entityID | type: <macro> The type of entity being damaged"
+				+ " | cause: <macro> One of " + StringUtils.Join(MCDamageCause.values(), ", ", ", or ", " or ")
 				+ " | world: <string match>} Fires when any loaded entity takes damage."
 				+ " {type: The type of entity the got damaged | id: The entityID of the victim"
 				+ " | player: the player who got damaged (only present if type is PLAYER) | world | location"

src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java

@@ -11,6 +11,7 @@
 import com.laytonsmith.abstraction.blocks.MCBlockFace;
 import com.laytonsmith.abstraction.enums.MCAction;
 import com.laytonsmith.abstraction.enums.MCFishingState;
+import com.laytonsmith.abstraction.enums.MCGameMode;
 import com.laytonsmith.abstraction.enums.MCTeleportCause;
 import com.laytonsmith.abstraction.events.*;
 import com.laytonsmith.annotations.api;
@@ -2082,7 +2083,9 @@ public String getName() {
 
 		@Override
 		public String docs() {
-			return "{newmode: <macro> gamemode being changed to | player: <macro>}"
+			return "{newmode: <macro> gamemode being changed to, one of "
+					+ StringUtils.Join(MCGameMode.values(), ", ", ", or ", " or ")
+					+ " | player: <macro>}"
 					+ " Fires when something causes a player's gamemode to change. Cancelling the event will"
 					+ " cancel the change. The mode itself cannot be modified."
 					+ " {player: player whose mode is changing | newmode}"