TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

AirSwipe Crash Prevention

Browse source 
Added a protective measure to check the amount of entities that are
about to have their velocities changed before moving them all. If there
are too many entities around it will damage them without changing their
velocity, that way we don't lag out and crash due to the firing of too
many EntityCollisionEvents.
This commit is contained in:
nathank33 2014-09-07 13:01:21 -07:00
parent 5c41d1230c
commit 5e9f4d72d9
1 changed files with 40 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/com/projectkorra/ProjectKorra/airbending/AirSwipe.java
View file

@ -2,6 +2,7 @@ package com.projectkorra.ProjectKorra.airbending;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Location;
@ -11,6 +12,7 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.BendingPlayer;
@ -28,7 +30,7 @@ import com.projectkorra.ProjectKorra.waterbending.WaterManipulation;
public class AirSwipe {
private static FileConfiguration config = ProjectKorra.plugin.getConfig();
private final int MAX_AFFECTABLE_ENTITIES = 10;
public static ConcurrentHashMap<Integer, AirSwipe> instances = new ConcurrentHashMap<Integer, AirSwipe>();
private static int ID = Integer.MIN_VALUE;
@ -228,37 +230,45 @@ public class AirSwipe {
private void affectPeople(Location location, Vector direction) {
Methods.removeSpouts(location, player);
for (Entity entity : Methods.getEntitiesAroundPoint(location, affectingradius)) {
final List<Entity> entities = Methods.getEntitiesAroundPoint(location, affectingradius);
final List<Entity> surroundingEntities = Methods.getEntitiesAroundPoint(location, 4);
final Vector fDirection = direction;
for(int i = 0; i < entities.size(); i++){
final Entity entity = entities.get(i);
new BukkitRunnable(){
public void run(){
if (Methods.isRegionProtectedFromBuild(player, "AirSwipe", entity.getLocation()))
continue;
return;
if (entity.getEntityId() != player.getEntityId()) {
if (entity instanceof Player) {
if (Commands.invincible.contains(((Player) entity).getName())) continue;
if (Commands.invincible.contains(((Player) entity).getName()))
return;
}
if(surroundingEntities.size() < MAX_AFFECTABLE_ENTITIES){
if (AvatarState.isAvatarState(player)) {
entity.setVelocity(direction.multiply(AvatarState.getValue(pushfactor)));
entity.setVelocity(fDirection.multiply(AvatarState.getValue(pushfactor)));
} else {
entity.setVelocity(direction.multiply(pushfactor));
entity.setVelocity(fDirection.multiply(pushfactor));
}
}
if (entity instanceof LivingEntity
&& !affectedentities.contains(entity)) {
if (damage != 0)
Methods.damageEntity(player, entity, damage);
affectedentities.add(entity);
}
if (entity instanceof Player) {
new Flight((Player) entity, player);
}
Methods.breakBreathbendingHold(entity);
if (elements.containsKey(direction)) {
elements.remove(direction);
if (elements.containsKey(fDirection)) {
elements.remove(fDirection);
}
}
}
}.runTaskLater(ProjectKorra.plugin, i / MAX_AFFECTABLE_ENTITIES);
}
}
private boolean isBlockBreakable(Block block) {