Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java

@@ -634,10 +634,7 @@ public class UtilEnt
 				//Fences/Walls
 				Material beneath = player.getLocation().add(x, -1.5, z).getBlock().getType();
 				if (player.getLocation().getY() % 0.5 == 0 &&
-						(beneath == Material.FENCE || 
-						beneath == Material.FENCE_GATE || 
-						beneath == Material.NETHER_FENCE || 
-						beneath == Material.COBBLE_WALL))
+					(beneath.toString().contains("FENCE") || beneath == Material.COBBLE_WALL))
 					return true;
 			}	
 		}

Plugins/plugin.xml

@@ -44,7 +44,6 @@
                 <configuration>
                     <artifactSet>
                         <excludes>
-                            <exclude>commons-codec:commons-codec</exclude>
                             <exclude>com.google.code.gson:gson</exclude>
                             <exclude>com.mineplex:spigot</exclude>
                         </excludes>

Plugins/pom.xml

@@ -123,7 +123,7 @@
             <dependency>
                 <groupId>redis.clients</groupId>
                 <artifactId>jedis</artifactId>
-                <version>2.7.2</version>
+                <version>2.6.2</version>
                 <scope>compile</scope>
             </dependency>
         </dependencies>