EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 22:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Further separate crossbows from bows

Browse Source
This commit is contained in:
nossr50 2020-07-10 20:17:37 -07:00
parent 7543d8be12
commit 5ed415e453
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -6,6 +6,7 @@ import com.gmail.nossr50.config.WorldBlacklist;
import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.meta.ProjectileOriginMeta; import com.gmail.nossr50.datatypes.meta.ProjectileOriginMeta;
import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.subskills.interfaces.InteractType; import com.gmail.nossr50.datatypes.skills.subskills.interfaces.InteractType;
import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent; import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
@ -148,15 +149,32 @@ public class EntityListener implements Listener {
projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, projectile.getLocation())); projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, projectile.getLocation()));
boolean isCrossbow = false;
//Track origin of projectile //Track origin of projectile
if(ItemUtils.hasItemInMainHand(player, "bow")) { if(ItemUtils.hasItemInMainHand(player, "bow")) {
markProjectileOriginAsBow(projectile); markProjectileOriginAsBow(projectile);
} else if(ItemUtils.hasItemInMainHand(player, "crossbow")) { } else if(ItemUtils.hasItemInMainHand(player, "crossbow")) {
markProjectileOriginAsCrossbow(projectile); markProjectileOriginAsCrossbow(projectile);
isCrossbow = true;
} else if(ItemUtils.hasItemInOffHand(player, "bow")) { } else if(ItemUtils.hasItemInOffHand(player, "bow")) {
markProjectileOriginAsBow(projectile); markProjectileOriginAsBow(projectile);
} else if(ItemUtils.hasItemInOffHand(player, "crossbow")) { } else if(ItemUtils.hasItemInOffHand(player, "crossbow")) {
markProjectileOriginAsCrossbow(projectile); markProjectileOriginAsCrossbow(projectile);
isCrossbow = true;
}
//Crossbow only
if(isCrossbow) {
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
//Process launch event
if(Permissions.skillEnabled(player, PrimarySkillType.CROSSBOWS)) {
if(mcMMOPlayer != null) {
mcMMOPlayer.getCrossbowManager().processProjectileLaunchEvent(event);
}
}
} }
for(Enchantment enchantment : player.getInventory().getItemInMainHand().getEnchantments().keySet()) { for(Enchantment enchantment : player.getInventory().getItemInMainHand().getEnchantments().keySet()) {
@ -164,11 +182,14 @@ public class EntityListener implements Listener {
return; return;
} }
//Bow only
if(!isCrossbow) {
if (RandomChanceUtil.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.ARCHERY_ARROW_RETRIEVAL, player)) { if (RandomChanceUtil.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.ARCHERY_ARROW_RETRIEVAL, player)) {
projectile.setMetadata(mcMMO.trackedArrow, mcMMO.metadataValue); projectile.setMetadata(mcMMO.trackedArrow, mcMMO.metadataValue);
} }
} }
} }
}
private void markProjectileOriginAsCrossbow(Projectile projectile) { private void markProjectileOriginAsCrossbow(Projectile projectile) {
projectile.setMetadata(mcMMO.PROJECTILE_ORIGIN_METAKEY, new ProjectileOriginMeta(plugin, 2)); projectile.setMetadata(mcMMO.PROJECTILE_ORIGIN_METAKEY, new ProjectileOriginMeta(plugin, 2));

10
src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java
View File

@ -8,6 +8,7 @@ import com.gmail.nossr50.skills.archery.Archery;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.event.entity.ProjectileLaunchEvent;
public class CrossbowManager extends SkillManager { public class CrossbowManager extends SkillManager {
public CrossbowManager(McMMOPlayer mcMMOPlayer) { public CrossbowManager(McMMOPlayer mcMMOPlayer) {
@ -36,4 +37,13 @@ public class CrossbowManager extends SkillManager {
return 1 + Math.min(firedLocation.distance(targetLocation), 50) * Archery.DISTANCE_XP_MULTIPLIER; return 1 + Math.min(firedLocation.distance(targetLocation), 50) * Archery.DISTANCE_XP_MULTIPLIER;
} }
/**
* Used for sub-skills that activate on projectile launch
* @param projectileLaunchEvent target event
*/
public void processProjectileLaunchEvent(ProjectileLaunchEvent projectileLaunchEvent) {
mcMMOPlayer.getPlayer().sendMessage("Pew pew!");
}
} }