Merge branch 'master' into redrak # Conflicts: # src/main/java/cn/nukkit/Player.java # src/main/java/cn/nukkit/inventory/PlayerInventory.java # src/main/java/cn/nukkit/network/RakNetInterface.java
Merge branch 'master' into redrak # Conflicts: # src/main/java/cn/nukkit/Player.java # src/main/java/cn/nukkit/inventory/PlayerInventory.java # src/main/java/cn/nukkit/network/RakNetInterface.java