CraftAttack/spawn
5
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: CraftAttack:3c1dea3451145fe2b7db842347827f7b32a05c2c
Branches Tags
CraftAttack:master
CraftAttack:master-antiGrief
..
compare: CraftAttack:70a1740644875a06975fc6f6bf46c191aa3fd9b4
Branches Tags
CraftAttack:master
CraftAttack:master-antiGrief

No commits in common. "3c1dea3451145fe2b7db842347827f7b32a05c2c" and "70a1740644875a06975fc6f6bf46c191aa3fd9b4" have entirely different histories.
3c1dea3451 ... 70a1740644

3 changed files with 8 additions and 47 deletions
Show Stats Expand all files Collapse all files

15
src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancementsDamageEntityListener.java
View File

@ -1,7 +1,7 @@
package eu.mhsl.craftattack.spawn.appliances.customAdvancements; package eu.mhsl.craftattack.spawn.appliances.customAdvancements;
import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
import org.bukkit.Material; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
@ -9,11 +9,12 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
public class CustomAdvancementsDamageEntityListener extends ApplianceListener<CustomAdvancements> { public class CustomAdvancementsDamageEntityListener extends ApplianceListener<CustomAdvancements> {
@EventHandler @EventHandler
public void onEntityDamageEntity(EntityDamageByEntityEvent event) { public void onEntityDamageEntity(EntityDamageByEntityEvent event) {
if(!(event.getEntity() instanceof Player damaged)) return; Entity damaged = event.getEntity();
if(!(event.getDamager() instanceof Player damager)) return; if(!(damaged instanceof Player)) return;
if(!damager.getInventory().getItemInMainHand().getType().equals(Material.AIR)) return; Entity damager = event.getDamager();
if(!damaged.hasPermission("admin")) return; if(!(damager instanceof Player)) return;
if(damaged.hasPermission("admin")) {
getAppliance().grantAdvancement("search_trouble", damager); getAppliance().grantAdvancement("search_trouble", (Player) damager);
}
} }
} }

22
src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockback.java
View File

@ -1,22 +0,0 @@
package eu.mhsl.craftattack.spawn.appliances.snowballKnockback;
import eu.mhsl.craftattack.spawn.appliance.Appliance;
import org.bukkit.entity.LivingEntity;
import org.bukkit.event.Listener;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class SnowballKnockback extends Appliance {
public void dealKnockback(LivingEntity entity, Vector velocityVector, double strength, double damage) {
entity.damage(damage);
entity.knockback(strength, -velocityVector.getX(), -velocityVector.getZ());
}
@Override
@NotNull
protected List<Listener> listeners() {
return List.of(new SnowballKnockbackListener());
}
}

18
src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockbackListener.java
View File

@ -1,18 +0,0 @@
package eu.mhsl.craftattack.spawn.appliances.snowballKnockback;
import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.ProjectileHitEvent;
public class SnowballKnockbackListener extends ApplianceListener<SnowballKnockback> {
@EventHandler
public void onSnowballHit(ProjectileHitEvent event) {
if(event.getHitEntity() == null) return;
if(!event.getEntityType().equals(EntityType.SNOWBALL)) return;
if(!(event.getHitEntity() instanceof LivingEntity hitEntity)) return;
Entity snowball = event.getEntity();
getAppliance().dealKnockback(hitEntity, snowball.getVelocity(), 0.4, 0.1);
}
}