tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert Bomber and Equestrian mutations

This commit is contained in:
BuildTools 2017-06-06 00:05:45 -07:00
parent 3d64b00d39
commit 34993f09eb
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
PGM/src/main/java/tc/oc/pgm/mutation/types/kit/EquestrianMutation.java
View File

@ -3,7 +3,9 @@ package tc.oc.pgm.mutation.types.kit;
import com.google.common.collect.ImmutableMap;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.*;
import org.bukkit.entity.AbstractHorse;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
@ -20,12 +22,13 @@ import tc.oc.pgm.match.Match;
import tc.oc.pgm.match.MatchPlayer;
import tc.oc.pgm.mutation.types.EntityMutation;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import static tc.oc.commons.core.util.Optionals.cast;
public class EquestrianMutation extends EntityMutation<LivingEntity> {
public class EquestrianMutation extends EntityMutation<AbstractHorse> {
final static ImmutableMap<EntityType, Integer> TYPE_MAP = new ImmutableMap.Builder<EntityType, Integer>()
.put(EntityType.HORSE, 100)
@ -76,35 +79,31 @@ public class EquestrianMutation extends EntityMutation<LivingEntity> {
super.apply(player);
Location location = player.getLocation();
if(spawnable(location)) {
register(world().spawn(location, (Class<LivingEntity>) TYPES.choose(entropy()).getEntityClass()), player);
spawn(location, (Class<AbstractHorse>) TYPES.choose(entropy()).getEntityClass(), player);
}
}
@Override
public LivingEntity register(LivingEntity entity, @Nullable MatchPlayer owner) {
super.register(entity, owner);
if (entity instanceof AbstractHorse) {
AbstractHorse horse = (AbstractHorse)entity;
if(owner != null) {
horse.setAdult();
horse.setJumpStrength(2 * entropy().randomDouble());
horse.setDomestication(1);
horse.setMaxDomestication(1);
horse.setTamed(true);
horse.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, Integer.MAX_VALUE, 0));
horse.setOwner(owner.getBukkit());
horse.setPassenger(owner.getBukkit());
cast(horse, Horse.class).ifPresent(horsey -> {
horsey.setStyle(entropy().randomElement(Horse.Style.values()));
horsey.setColor(entropy().randomElement(Horse.Color.values()));
HorseInventory inventory = horsey.getInventory();
inventory.setSaddle(item(Material.SADDLE));
inventory.setArmor(item(ARMOR.choose(entropy())));
});
}
return horse;
public AbstractHorse register(AbstractHorse horse, @Nullable MatchPlayer owner) {
super.register(horse, owner);
if(owner != null) {
horse.setAdult();
horse.setJumpStrength(2 * entropy().randomDouble());
horse.setDomestication(1);
horse.setMaxDomestication(1);
horse.setTamed(true);
horse.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, Integer.MAX_VALUE, 0));
horse.setOwner(owner.getBukkit());
horse.setPassenger(owner.getBukkit());
cast(horse, Horse.class).ifPresent(horsey -> {
horsey.setStyle(entropy().randomElement(Horse.Style.values()));
horsey.setColor(entropy().randomElement(Horse.Color.values()));
HorseInventory inventory = horsey.getInventory();
inventory.setSaddle(item(Material.SADDLE));
inventory.setArmor(item(ARMOR.choose(entropy())));
});
}
return entity;
return horse;
}
public boolean spawnable(Location location) {
@ -121,9 +120,9 @@ public class EquestrianMutation extends EntityMutation<LivingEntity> {
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
public void onEntityDamage(EntityDamageByEntityEvent event) {
if(playerByEntity(event.getEntity()).flatMap(MatchPlayer::competitor)
.equals(match().participant(event.getDamager()).flatMap(MatchPlayer::competitor))) {
.equals(match().participant(event.getDamager()).flatMap(MatchPlayer::competitor))) {
event.setCancelled(true);
}
}
}
}

25
PGM/src/main/java/tc/oc/pgm/mutation/types/targetable/BomberMutation.java
View File

@ -2,7 +2,6 @@ package tc.oc.pgm.mutation.types.targetable;
import com.google.common.collect.Range;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.util.Vector;
import tc.oc.pgm.match.Match;
@ -14,7 +13,7 @@ import java.time.Duration;
import java.time.Instant;
import java.util.List;
public class BomberMutation extends EntityMutation<Entity> implements TargetMutation {
public class BomberMutation extends EntityMutation<TNTPrimed> implements TargetMutation {
final static Duration FREQUENCY = Duration.ofSeconds(30);
final static Range<Integer> TARGETS = Range.closed(2, 5);
@ -34,16 +33,16 @@ public class BomberMutation extends EntityMutation<Entity> implements TargetMuta
int height = entropy().randomInt(HEIGHT);
Location location = player.getLocation().clone().add(0, height, 0);
for(int i = 0; i < bombs; i++) {
TNTPrimed tnt = (TNTPrimed) register(world().spawn(location, TNTPrimed.class),null);
TNTPrimed tnt = spawn(location, TNTPrimed.class);
tnt.setGlowing(true);
tnt.setIsIncendiary(false);
tnt.setFuseTicks(200);
tnt.setVelocity(
new Vector(
(random().nextBoolean() ? .5 : -.5) * entropy().randomDouble(),
-entropy().randomDouble(),
(random().nextBoolean() ? .5 : -.5) * entropy().randomDouble()
)
new Vector(
(random().nextBoolean() ? .5 : -.5) * entropy().randomDouble(),
-entropy().randomDouble(),
(random().nextBoolean() ? .5 : -.5) * entropy().randomDouble()
)
);
}
});
@ -70,10 +69,8 @@ public class BomberMutation extends EntityMutation<Entity> implements TargetMuta
}
@Override
public void remove(Entity entity) {
if (entity instanceof TNTPrimed) {
((TNTPrimed)entity).setFuseTicks(entropy().randomInt(TICKS));
}
public void remove(TNTPrimed entity) {
entity.setFuseTicks(entropy().randomInt(TICKS));
}
@Override
@ -85,7 +82,7 @@ public class BomberMutation extends EntityMutation<Entity> implements TargetMuta
@Override
public void tick() {
TargetMutation.super.tick();
entities().filter(Entity::isOnGround).forEach(this::despawn);
entities().filter(TNTPrimed::isOnGround).forEach(this::despawn);
}
}
}