Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed large if-else to use a HashMap #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Changed large if-else to use a HashMap #7

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1006bd5
Refactored a if-else tower in CraftEventFactory.java to be a hashmap. It
mart2967 Apr 18, 2014
f6e47ae
amended previous; removed reformatting mess and made the sourceToCause
mart2967 Apr 24, 2014
8a2f501
Merge branch 'master' of https://github.com/mart2967/CraftBukkit.git
mart2967 Apr 24, 2014
4834ac7
added back file that git deleted
mart2967 Apr 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.net.InetAddress;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -77,7 +78,9 @@
public class CraftEventFactory {
public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.BURN);
public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC);


static HashMap<DamageSource, DamageCause> sourceToCause = initializeSourceToCauseMap();//new HashMap<DamageSource, DamageCause>();

// helper methods
private static boolean canBuild(CraftWorld world, Player player, int x, int z) {
WorldServer worldServer = world.getHandle();
Expand All @@ -94,6 +97,20 @@ private static boolean canBuild(CraftWorld world, Player player, int x, int z) {
return distanceFromSpawn > spawnSize;
}

private static HashMap<DamageSource, DamageCause> initializeSourceToCauseMap() {
HashMap<DamageSource, DamageCause> data = new HashMap<DamageSource, DamageCause>();
data.put(DamageSource.FIRE, DamageCause.FIRE);
data.put(DamageSource.STARVE, DamageCause.STARVATION);
data.put(DamageSource.WITHER, DamageCause.WITHER);
data.put(DamageSource.STUCK, DamageCause.SUFFOCATION);
data.put(DamageSource.DROWN, DamageCause.DROWNING);
data.put(DamageSource.BURN, DamageCause.FIRE_TICK);
data.put(MELTING, DamageCause.MELTING);
data.put(POISON, DamageCause.POISON);
data.put(DamageSource.MAGIC, DamageCause.MAGIC);
return data;
}

public static <T extends Event> T callEvent(T event) {
Bukkit.getServer().getPluginManager().callEvent(event);
return event;
Expand Down Expand Up @@ -419,27 +436,10 @@ public static EntityDamageEvent handleEntityDamageEvent(Entity entity, DamageSou
return event;
}


DamageCause cause = null;
if (source == DamageSource.FIRE) {
cause = DamageCause.FIRE;
} else if (source == DamageSource.STARVE) {
cause = DamageCause.STARVATION;
} else if (source == DamageSource.WITHER) {
cause = DamageCause.WITHER;
} else if (source == DamageSource.STUCK) {
cause = DamageCause.SUFFOCATION;
} else if (source == DamageSource.DROWN) {
cause = DamageCause.DROWNING;
} else if (source == DamageSource.BURN) {
cause = DamageCause.FIRE_TICK;
} else if (source == MELTING) {
cause = DamageCause.MELTING;
} else if (source == POISON) {
cause = DamageCause.POISON;
} else if (source == DamageSource.MAGIC) {
cause = DamageCause.MAGIC;
}

cause = sourceToCause.get(source);

if (cause != null) {
return callEntityDamageEvent(null, entity, cause, damage);
}
Expand Down Expand Up @@ -774,4 +774,4 @@ public static Cancellable handleStatisticsIncrease(EntityHuman entityHuman, net.
entityHuman.world.getServer().getPluginManager().callEvent(event);
return (Cancellable) event;
}
}
}