Upstream
/
UltimateStacker
mirror of https://github.com/songoda/UltimateStacker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for death handling.

This commit is contained in:
Brianna 2019-05-08 15:40:56 -04:00
parent 91c1059386
commit 121ce59e3d
2 changed files with 6 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
.gitignore vendored
View File

@ -1,238 +1,3 @@
\.idea/compiler\.xml
\.idea/libraries/Arconix\.xml
\.idea/libraries/Maven__br_net_fabiozumbi12_RedProtect_7_3_0\.xml
\.idea/libraries/Maven__com_google_code_gson_gson_2_2_4\.xml
\.idea/libraries/Maven__com_google_guava_guava_17_0\.xml
\.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1\.xml
\.idea/libraries/Maven__com_massivecraft_factions_LATEST\.xml
\.idea/libraries/Maven__com_massivecraft_factionsuuid_LATEST\.xml
\.idea/libraries/Maven__com_palmergames_bukkit_towny_LATEST\.xml
\.idea/libraries/Maven__com_plotsquared_RELEASE\.xml
\.idea/libraries/Maven__com_sk89q_worldedit_LATEST\.xml
\.idea/libraries/Maven__com_sk89q_worldguard_6_2_2\.xml
\.idea/libraries/Maven__com_songoda_arconix_LATEST\.xml
\.idea/libraries/Maven__com_songoda_epicspawners_LATEST\.xml
\.idea/libraries/Maven__com_wasteofplastic_askyblock_3_0_6_8\.xml
\.idea/libraries/Maven__commons_lang_commons_lang_2_6\.xml
\.idea/libraries/Maven__javax_persistence_persistence_api_1_0\.xml
\.idea/libraries/Maven__junit_junit_4_10\.xml
\.idea/libraries/Maven__me_markeh_factionsframework_1_2_0\.xml
\.idea/libraries/Maven__me_ryanhamshire_GriefPrevention_LATEST\.xml
\.idea/libraries/Maven__net_milkbowl_vault_VaultAPI_1_6\.xml
\.idea/libraries/Maven__org_avaje_ebean_2_8_1\.xml
\.idea/libraries/Maven__org_bukkit_bukkit_1_9_R0_1_SNAPSHOT\.xml
\.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1\.xml
\.idea/libraries/Maven__org_kingdoms_LATEST\.xml
\.idea/libraries/Maven__org_spigotmc_spigot_1_13_2\.xml
\.idea/libraries/Maven__org_yaml_snakeyaml_1_15\.xml
\.idea/libraries/Maven__us_talabrek_ultimateskyblock_LATEST\.xml
\.idea/libraries/spigot_1_12_2\.xml
\.idea/misc\.xml
\.idea/modules\.xml
\.idea/uiDesigner\.xml
\.idea/workspace\.xml
out/production/UltimateStacker/com/songoda/ultimatestacker/stack/Stack\.class
out/production/UltimateStacker/com/songoda/ultimatestacker/stack/StackManager\.class
out/production/UltimateStacker/com/songoda/ultimatestacker/tasks/StackingTask\.class
out/production/UltimateStacker/com/songoda/ultimatestacker/UltimateStacker\.class
out/production/UltimateStacker/plugin\.yml
target/classes/com/songoda/ultimatestacker/command/AbstractCommand\.class
target/classes/com/songoda/ultimatestacker/command/AbstractCommand\$ReturnType\.class
target/classes/com/songoda/ultimatestacker/command/CommandManager\.class
target/classes/com/songoda/ultimatestacker/command/commands/CommandGive\.class
target/classes/com/songoda/ultimatestacker/command/commands/CommandReload\.class
target/classes/com/songoda/ultimatestacker/command/commands/CommandUltimateStacker\.class
target/classes/com/songoda/ultimatestacker/entity/EntityStack\.class
target/classes/com/songoda/ultimatestacker/entity/EntityStackManager\.class
target/classes/com/songoda/ultimatestacker/events/BlockListeners\.class
target/classes/com/songoda/ultimatestacker/events/DeathListeners\.class
target/classes/com/songoda/ultimatestacker/events/DropListeners\.class
target/classes/com/songoda/ultimatestacker/events/ShearListeners\.class
target/classes/com/songoda/ultimatestacker/events/SpawnerListeners\.class
target/classes/com/songoda/ultimatestacker/handlers/HologramHandler\.class
target/classes/com/songoda/ultimatestacker/Locale\.class
target/classes/com/songoda/ultimatestacker/References\.class
target/classes/com/songoda/ultimatestacker/spawner/SpawnerStack\.class
target/classes/com/songoda/ultimatestacker/spawner/SpawnerStackManager\.class
target/classes/com/songoda/ultimatestacker/storage/Storage\.class
target/classes/com/songoda/ultimatestacker/storage/StorageItem\.class
target/classes/com/songoda/ultimatestacker/storage/StorageRow\.class
target/classes/com/songoda/ultimatestacker/storage/types/StorageMysql\.class
target/classes/com/songoda/ultimatestacker/storage/types/StorageYaml\.class
target/classes/com/songoda/ultimatestacker/tasks/StackingTask\.class
target/classes/com/songoda/ultimatestacker/UltimateStacker\.class
target/classes/com/songoda/ultimatestacker/utils/Methods\.class
target/classes/com/songoda/ultimatestacker/utils/MySQLDatabase\.class
target/classes/com/songoda/ultimatestacker/utils/SettingsManager\.class
target/classes/com/songoda/ultimatestacker/utils/SettingsManager\$settings\.class
target/classes/en_US\.lang
target/classes/plugin\.yml
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles\.lst
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles\.lst
\.idea/vcs\.xml
UltimateStacker\.iml
\.idea/libraries/Maven__org_spigotmc_spigot_1_12_2\.xml
target/classes/com/songoda/ultimatestacker/events/InteractListeners\.class
target/classes/com/songoda/ultimatestacker/utils/Reflection\.class
target/classes/com/songoda/ultimatestacker/utils/ServerVersion\.class
target/classes/com/songoda/ultimatestacker/command/commands/CommandRemoveAll\.class
target/classes/com/songoda/ultimatestacker/command/commands/CommandSettings\.class
target/classes/SettingDefinitions\.yml
\.idea/libraries/Maven__bammerbom_ultimatecore_LATEST\.xml
\.idea/libraries/Maven__com_earth2me_essentials_LATEST\.xml
\.idea/libraries/Maven__com_gamingmesh_jobs_LATEST\.xml
\.idea/libraries/Maven__com_gmail_nossr50_mcmmo_LATEST\.xml
\.idea/libraries/Maven__com_sk89q_worldguard_7_0_0\.xml
\.idea/libraries/Maven__de_diddiz_logblock_LATEST\.xml
\.idea/libraries/Maven__me_botsko_prism_LATEST\.xml
\.idea/libraries/Maven__me_clip_placeholderapi_2_5_1\.xml
\.idea/libraries/Maven__net_coreprotect_LATEST\.xml
\.idea/libraries/Maven__net_milkbowl_vault_LATEST\.xml
\.idea/libraries/Maven__net_sothatsit_blockstore_LATEST\.xml
\.idea/libraries/Maven__org_black_ixx_playerpoints_2_1_4\.xml
\.idea/libraries/Maven__uk_antiperson_stackmob_LATEST\.xml
\.idea/libraries/Maven__xyz_wildseries_wildstacker_b6\.xml
\.idea/libraries/Maven__com_gmail_filoghost_holographicdisplays_holographicdisplays_LATEST\.xml
target/classes/com/songoda/ultimatestacker/events/BreedListeners\.class
target/classes/com/songoda/ultimatestacker/events/EntityListeners\.class
target/classes/com/songoda/ultimatestacker/hologram/Hologram\.class
target/classes/com/songoda/ultimatestacker/hologram/HologramArconix\.class
target/classes/com/songoda/ultimatestacker/hologram/HologramHolographicDisplays\.class
\.idea/encodings\.xml
\.idea/libraries/Maven__com_gmail_filoghost_holographicdisplays_holographicdisplays_api_2_3_2\.xml
\.idea/libraries/Maven__com_songoda_arconix_2_0_0\.xml
\.idea/libraries/Maven__net_milkbowl_vault_1_7_1\.xml
target/classes/com/songoda/ultimatestacker/events/InteractListeners\$1\.class
target/classes/com/songoda/ultimatestacker/events/InventoryListeners\.class
target/classes/com/songoda/ultimatestacker/utils/ConfigWrapper\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$1\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$2\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$AdvancedBarChart\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$AdvancedPie\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$CustomChart\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$DrilldownPie\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$MultiLineChart\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$SimpleBarChart\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$SimplePie\.class
target/classes/com/songoda/ultimatestacker/utils/Metrics\$SingleLineChart\.class
target/classes/META-INF/UltimateStacker\.kotlin_module
\.idea
\target
UltimateStacker.iml

4
src/main/java/com/songoda/ultimatestacker/utils/Methods.java
View File

@ -99,7 +99,9 @@ public class Methods {
newEntity.setVelocity(killed.getVelocity());
if (killed instanceof Ageable && !((Ageable) killed).isAdult()) {
((Ageable) newEntity).setBaby();
} else if (killed instanceof Llama) {
}
if (killed instanceof Llama) {
((Llama) newEntity).setColor(((Llama) killed).getColor());
} else if (killed instanceof Sheep) {
((Sheep) newEntity).setColor(((Sheep) killed).getColor());