Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-09-29 15:37:27 +02:00
Code Issues Projects Releases Wiki Activity

Update health to float, begin adding serialVersionUIDs

Browse Source
This commit is contained in:
HappyPikachu 2015-01-05 12:31:02 -05:00
parent 2c10b2a2bc
commit 85d5dc0414
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/me/blackvein/quests/Event.java
View File

@ -6,8 +6,10 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import me.blackvein.quests.util.ItemUtil;
import me.blackvein.quests.util.QuestMob;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
import org.bukkit.Location;
@ -36,11 +38,14 @@ public class Event {
int thunderDuration = 0;
public LinkedList<QuestMob> mobSpawns = new LinkedList<QuestMob>() {
@Override
private static final long serialVersionUID = -761974607799449780L;
@Override
public boolean equals(Object o) {
if (o instanceof LinkedList) {
LinkedList<QuestMob> other = (LinkedList<QuestMob>) o;
@SuppressWarnings("unchecked")
LinkedList<QuestMob> other = (LinkedList<QuestMob>) o;
if (size() != other.size()) {
return false;
@ -60,7 +65,7 @@ public class Event {
LinkedList<PotionEffect> potionEffects = new LinkedList<PotionEffect>();
int hunger = -1;
int saturation = -1;
int health = -1;
float health = -1;
Location teleport;
@Override

2
src/main/java/me/blackvein/quests/EventFactory.java
View File

@ -336,7 +336,7 @@ public class EventFactory implements ConversationAbandonedListener, ColorUtil {
if (event.health > -1) {
context.setSessionData(CK.E_HEALTH, (Integer) event.health);
context.setSessionData(CK.E_HEALTH, (Float) event.health);
}