LogalDeveloper/Snowbrawl
0
Fork 0
Code Issues 4 Actions Releases Activity

Fixed snowballs fired from bows not awarding kills to shooters.

Browse Source
This commit is contained in:
Logan Fick
2022-06-04 14:49:49 -04:00
parent bab7f7ed3a
commit 619834040a
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/dev/logal/snowbrawl/managers/ArenaManager.java
View File

@@ -12,7 +12,10 @@ import dev.logal.snowbrawl.Snowbrawl;
import dev.logal.snowbrawl.types.Arena; import dev.logal.snowbrawl.types.Arena;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.*; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.Snowball;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@@ -559,18 +562,13 @@ public class ArenaManager implements Listener {
*/ */
@EventHandler @EventHandler
public void onEntityShootBow(final EntityShootBowEvent event){ public void onEntityShootBow(final EntityShootBowEvent event){
final Entity entity = event.getEntity(); final Arena arena = this.getArenaByLocation(event.getEntity().getLocation());
final Arena arena = this.getArenaByLocation(entity.getLocation());
if (arena != null){ // Is the entity shooting from inside an arena? if (arena != null){ // Is the entity shooting from inside an arena?
event.setCancelled(true); // Cancel the original shot.
final Entity arrow = event.getProjectile(); // Get the arrow which was about to be shot. final Entity arrow = event.getProjectile(); // Get the arrow which was about to be shot.
final Entity snowball = entity.getWorld().spawnEntity(arrow.getLocation(), EntityType.SNOWBALL); // Spawn a new snowball at the arrow's location.
// TODO: This is not enough info to transfer information about the shooter. Dying entities only know they were killed by Snowball. event.getEntity().launchProjectile(Snowball.class).setVelocity(arrow.getVelocity()); // Make the shooter fire a snowball with the same velocity as the original arrow.
snowball.setVelocity(arrow.getVelocity()); // Copy the arrow's velocity to the new snowball.
snowball.setLastDamageCause(arrow.getLastDamageCause()); // Carry over damage cause from the arrow to the snowball.
event.setProjectile(snowball); // Change the projectile to the snowball.
} }
} }