Add ability to catch entities with fishing #301
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ErikSzabo
commented
Jul 4, 2024
Comment on lines
126
to
135
| Location location = event.getHook().getLocation(); | ||
| Entity entity = loot.getEntity().spawnEntity(plugin, event.getHook().getLocation()); | ||
|
|
||
| LootDropEvent dropEvent = new LootDropEvent(player, plugin.getUser(player).toApi(), entity, event.getHook().getLocation(), cause); | ||
| Bukkit.getPluginManager().callEvent(dropEvent); | ||
|
|
||
| if (dropEvent.isCancelled()) { | ||
| loot.getEntity().removeEntity(entity); | ||
| return; | ||
| } |
There was a problem hiding this comment.
This can be dumb if the event is canceled since the entity will spawn and will be removed immediately. Sadly I don't know any other way without using NMS.
Archy-X
reviewed
Jul 5, 2024
bukkit/src/main/java/dev/aurelium/auraskills/bukkit/loot/entity/EntityProperties.java
Show resolved
Hide resolved
Archy-X
requested changes
Jul 5, 2024
...src/main/java/dev/aurelium/auraskills/bukkit/hooks/mythicmobs/loot/MythicEntitySupplier.java
Show resolved
Hide resolved
| return new EntityProperties( | ||
| id.length > 1 ? id[1] : id[0], | ||
| config.node("name").getString(), | ||
| config.node("level").empty() ? null :config.node("level").getInt(), |
bukkit/src/main/java/dev/aurelium/auraskills/bukkit/loot/entity/EntitySupplier.java
Show resolved
Hide resolved
bukkit/src/main/java/dev/aurelium/auraskills/bukkit/loot/entity/EntitySupplier.java
Show resolved
Hide resolved
bukkit/src/main/java/dev/aurelium/auraskills/bukkit/loot/entity/VanillaEntityParser.java
Show resolved
Hide resolved
| itemEntity.setItemStack(new ItemStack(Material.AIR)); | ||
|
|
||
| Float hVelocity = loot.getEntity().getEntityProperties().horizontalVelocity(); | ||
| if(hVelocity == null) hVelocity = 1.2f; |
bukkit/src/main/java/dev/aurelium/auraskills/bukkit/loot/parser/EntityLootParser.java
Show resolved
Hide resolved
bukkit/src/main/java/dev/aurelium/auraskills/bukkit/loot/type/EntityLoot.java
Show resolved
Hide resolved
| } | ||
|
|
||
| if (getEntityProperties().level() != null) { | ||
| entity.setMetadata("aura_skills_level", new FixedMetadataValue(plugin, getEntityProperties().level())); |
There was a problem hiding this comment.
auraskills should be one word without an underscore
|
Made those changes. Also enabled auto formatting in Intellij on save for the future :'D |
Archy-X
approved these changes
Jul 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds a new entity loot type for fishing (or it can be added to other loot tables as well, it just didn't really make sense).
The caught entity can be a vanilla entity (typically a mob) or a MythicMobs using the
mythicmobs:prefix. Entity health, damage, and level can also be configured.The vertical and horizontal velocities are also configurable for fishing but already have default values.
Example configuration in
fishing.yml: