EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 03:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Quick and dirty 1.13 update. I.e. it now compiles for 1.13.

Browse Source
This commit is contained in:
t00thpick1
2018-07-23 22:13:57 -04:00
parent 3d515aab23
commit 0a1559511a
25 changed files with 511 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
View File

@ -1,15 +1,5 @@
package com.gmail.nossr50.skills.unarmed;
import org.bukkit.Material;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;
import org.bukkit.material.SmoothBrick;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.AbilityType;
@ -17,6 +7,7 @@ import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.datatypes.skills.ToolType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.ItemUtils;
@ -24,6 +15,13 @@ import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.player.UserManager;
import com.gmail.nossr50.util.skills.SkillUtils;
import org.bukkit.Material;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;
public class UnarmedManager extends SkillManager {
public UnarmedManager(McMMOPlayer mcMMOPlayer) {
@ -64,19 +62,12 @@ public class UnarmedManager extends SkillManager {
MaterialData data = blockState.getData();
switch (blockState.getType()) {
case SMOOTH_BRICK:
case STONE_BRICKS:
if (!Unarmed.blockCrackerSmoothBrick) {
return false;
}
// Yes, this is awkward, but it's the *right* way to do it.
SmoothBrick smoothBrick = (SmoothBrick) data;
if (smoothBrick.getMaterial() != Material.STONE) {
return false;
}
smoothBrick.setMaterial(Material.COBBLESTONE);
blockState.setType(Material.CRACKED_STONE_BRICKS);
return true;
default: