diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar
index 81a23a9..a8b5352 100644
Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ
diff --git a/src/sig/plugin/TwosideKeeper/EliteMonster.java b/src/sig/plugin/TwosideKeeper/EliteMonster.java
index 465ac31..ee8d923 100644
--- a/src/sig/plugin/TwosideKeeper/EliteMonster.java
+++ b/src/sig/plugin/TwosideKeeper/EliteMonster.java
@@ -279,11 +279,14 @@ public class EliteMonster {
 			targetlist.add((Player)damager);
 		}
 		if (!participantlist.contains(damager) && (damager instanceof Player)) {
+			String name = "";
 			participantlist.add((Player)damager);
 		}
 		if (damager instanceof Player) {
 			Player p = (Player)damager;
-			p.addPotionEffect(new PotionEffect(PotionEffectType.WEAKNESS,20*2,9),true);
+			if (!p.hasPotionEffect(PotionEffectType.WEAKNESS)) {
+				p.addPotionEffect(new PotionEffect(PotionEffectType.WEAKNESS,20*2,9),true);
+			}
 		}
 		last_regen_time=TwosideKeeper.getServerTickTime();
 		double randomrate = 0d;
diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
index e20056f..39c2d88 100644
--- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
+++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
@@ -3352,7 +3352,7 @@ public class GenericFunctions {
 					TwosideKeeper.log("Dealt "+basedmg+" raw damage.", 5);
 					//DealDamageToMob(NewCombat.CalculateDamageReduction(basedmg,p,null),(LivingEntity)nearbyentities.get(i),null,null,"Slam");
 					TwosideKeeperAPI.DealDamageToEntity(NewCombat.CalculateDamageReduction(((fullcalculation)?NewCombat.CalculateWeaponDamage(damager, p):1.0)*basedmg,p,null), (Player)players.get(i), damager);
-					if (knockup) {
+					if (knockup && p.getHealth()>0) { //Prevent knockups if we die to the attack.
 						p.setVelocity(new Vector(0,knockupamt,0));
 					}
 				} else  {
diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
index 30b69f6..09bd254 100644
--- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
+++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
@@ -3304,25 +3304,6 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
 			}*/
 		}
     }
-
-    @EventHandler(priority=EventPriority.LOW,ignoreCancelled = true)
-    public void onPlayerKick(PlayerKickEvent ev) {
-    	if (DeathManager.deathStructureExists(ev.getPlayer())) {
-    		DeathStructure ds = DeathManager.getDeathStructure(ev.getPlayer());
-    		Location deathloc = ds.deathloc;
-    		Player p = ev.getPlayer();
-    		deathloc.getWorld().loadChunk(deathloc.getChunk());
-    		for (int i=0;i<p.getOpenInventory().getTopInventory().getSize();i++) {
-    			if (p.getOpenInventory().getTopInventory().getItem(i)!=null &&
-    					p.getOpenInventory().getTopInventory().getItem(i).getType()!=Material.AIR) {
-    				deathloc.getWorld().dropItemNaturally(deathloc, p.getOpenInventory().getTopInventory().getItem(i));
-    				log("Dropping "+p.getOpenInventory().getTopInventory().getItem(i).toString()+" at Death location "+deathloc,3);
-    			}
-    		}
-    		DeathManager.removeDeathStructure(p);
-    		DeathManager.removeDeathStructure(ev.getPlayer());
-    	}
-    }
     
     @EventHandler(priority=EventPriority.LOW,ignoreCancelled = true)
     public void onInventoryClick(InventoryClickEvent ev) {
@@ -3737,9 +3718,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
 			it.setCustomName((it.getItemStack().getItemMeta().hasDisplayName())?it.getItemStack().getItemMeta().getDisplayName():GenericFunctions.UserFriendlyMaterialName(it.getItemStack()));
 			it.setCustomNameVisible(true);
 		}
-    	if (GenericFunctions.isArtifactEquip(it.getItemStack())) {
-    		it.setInvulnerable(true);
-    	}
+    	it.setInvulnerable(true);
     }
     
     /**
@@ -4662,21 +4641,23 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
 					StringBuilder participants_list = new StringBuilder();
 					for (int i=0;i<participants.size();i++) {
 						Player pl = participants.get(i);
-						ExperienceOrb exp = GenericFunctions.spawnXP(pl.getLocation(), ev.getDroppedExp()*300);
-						exp.setInvulnerable(true);
-						GenericFunctions.giveItem(pl,aPlugin.API.getEliteBox());
-						log("Dropping "+aPlugin.API.getEliteBox().toString(),2);
-						if (participants_list.length()<1) { 
-							participants_list.append(pl.getName());
-						} else {
-							if (i==participants.size()-1) {
-								if (participants.size()==2) {
-									participants_list.append(" and "+pl.getName());
-								} else {
-									participants_list.append(", and "+pl.getName());
-								}
+						if (pl!=null && pl.isValid() && pl.isOnline()) {
+							ExperienceOrb exp = GenericFunctions.spawnXP(pl.getLocation(), ev.getDroppedExp()*300);
+							exp.setInvulnerable(true);
+							GenericFunctions.giveItem(pl,aPlugin.API.getEliteBox());
+							log("Dropping "+aPlugin.API.getEliteBox().toString(),2);
+							if (participants_list.length()<1) { 
+								participants_list.append(pl.getName());
 							} else {
-								participants_list.append(", "+pl.getName());
+								if (i==participants.size()-1) {
+									if (participants.size()==2) {
+										participants_list.append(" and "+pl.getName());
+									} else {
+										participants_list.append(", and "+pl.getName());
+									}
+								} else {
+									participants_list.append(", "+pl.getName());
+								}
 							}
 						}
 					}