Commit graph

43 commits

Author SHA1 Message Date
md678685 6c11569ac9 Merge branch '2.x' into 1.13 2018-08-14 18:58:06 +01:00
md678685 b8a8232bc3 Wrap all constructScalar calls with reflection
Allows configs to function with both SnakeYAML 1.19 and 1.21.
2018-08-06 18:19:30 +01:00
md678685 1ddb1822ef Merge branch '2.x' into 1.13 2018-08-05 23:02:11 +01:00
Ali Moghnieh 768b92749f
update bukkit to 1.13-R0.1-SNAPSHOT.
This commit just fixes compilation errors.
2018-07-29 17:39:32 +01:00
md678685 27d9f3725a
Wrap constructScalar for SnakeYAML 1.21 (#2040)
In theory, fixes #1974, fixes #1975 and fixes #1976, and also means that
Spigot are free to upgrade SnakeYAML to 1.21 again when ready.
2018-06-15 19:18:55 +01:00
Trent Hensler 1a820ad9b7 Initial removal of item IDs.
We do not rely on Bukkit's item ids anymore, though we still support them in commands via a mapping built off of the items.csv.
2017-12-12 22:06:25 -08:00
Minecrell 73457453bb Avoid using reflection for things SnakeYAML supports directly now (#1634)
Fixes #1631 properly.

e7ebc94a9e added a workaround to the
SnakeYAML constructor to avoid errors when unknown properties are
used in the storage files. Back then, it was necessary to copy the
method to catch the exception thrown when an unknown property was
encountered.

However, SnakeYAML 1.12 (included in Spigot 1.6.2+) added a method
to ignore missing properties without overriding parts of the
SnakeYAML implementation.

Delete the old workaround and make use of
PropertyUtils.setSkipMissingProperties(true) to achieve the same
effect.
2017-11-10 18:01:29 +00:00
vemacs 73ac6488ce Run IntelliJ IDEA inspections 2015-06-03 14:11:56 -06:00
drtshock dde0b20775 Reformat 2015-04-14 23:06:16 -05:00
Iaccidentally 3e725ef060 Cleanup various aspects of code, fix some formatting, more netbeans 7.4 stuff 2013-11-06 21:22:32 -05:00
KHobbits 59b501b2b1 Clean Imports 2013-10-11 03:44:41 +01:00
Iaccidentally dad348d3d0 [API] Move 2.x API to new package, create dummy classes for compatibility 2013-07-13 11:14:39 -04:00
Iaccidentally f1eae9be6f Cleanup imports 2013-06-11 20:45:12 +01:00
KHobbits 09f67c9723 Split util classes. 2013-06-08 22:31:19 +01:00
Iaccidentally 360e3e8801 cleanup :: fix build 2013-01-31 14:40:33 -05:00
Iaccidentally 4edc39360a Refactor name of ScheduleAsyncDelayedTask to RunTaskAsynchronously 2013-01-31 14:16:09 -05:00
Chris Ward 437b01e371 Unnecessary RegEx is unnecessary. 2013-01-08 00:08:11 +11:00
snowleo 3faedec602 Fix Spawns / Jail loading 2012-12-19 23:26:29 +01:00
md_5 87f5ec491e Simply using the SnakeYaml default (which in turn defaults to Class.forName) appears to be enough to get the classes for our custom configuration. This avoid Bukkit depreciation. 2012-12-19 19:10:02 +11:00
KHobbits f2b4bb00b6 Minor cleanup 2012-09-24 03:16:15 +01:00
KHobbits 62381a7f52 Async EssentialsSpawn join event, like the others. 2012-09-08 14:55:37 +01:00
KHobbits 8a9353fd09 Remove 3.x api migration code.
3.x development was moved to different code branch.
Removing deprecated warnings, since it would be silly to deprecate ALL classes.
2012-08-18 15:48:29 +01:00
KHobbits 9d545dcbf1 Don't register jail listeners, if no jails are set. 2012-03-28 15:03:18 +01:00
KHobbits 17be04cd99 Error and info cleanup. 2012-03-17 20:23:46 +00:00
snowleo 4425d53664 Only info not a warning if a file is missing 2011-12-20 12:25:30 +01:00
snowleo e7ebc94a9e SnakeYaml now ignores additional mapping values in files, so it throws less errors. 2011-12-07 11:57:31 +01:00
snowleo 854fc05c5b Fix serious bug in Dev2.7.137 - Dev2.7.144: if spawn.yml is not present, the server will run into a deadlock. 2011-12-07 00:08:45 +01:00
snowleo 72e187cd5c Updated Jails to use the new config classes 2011-12-06 17:28:48 +01:00
snowleo a7097df231 Refactoring to create less redundant code 2011-12-06 15:38:14 +01:00
snowleo 51390a9698 Prevent some rare cases of NPE and Deadlocks, better error handling on yaml load 2011-12-06 14:39:52 +01:00
snowleo 019b49ef11 Updated EssentialsSpawn to use the new config code
/spawn and /home now call the PlayerRespawnEvent to make it more compatible with other plugins.
2011-12-06 13:41:29 +01:00
snowleo f3b278eac2 More work done on config code 2011-12-06 10:37:17 +01:00
KHobbits 2dc6f8c202 Command Cleanup 2011-12-01 13:42:39 +00:00
snowleo 098072517a Added enchantment to /give and /item
Updated plugin.yml
2011-11-27 08:57:21 +01:00
snowleo b8f9a4b96f Implement correct hashCode() and equals() in EnchantmentLevel 2011-11-27 08:26:52 +01:00
snowleo 9c56b147ee Enchantment Multiplier in future Worth config 2011-11-27 08:18:41 +01:00
snowleo 3c71ae4cd9 Locale.ENGLISH!!1! 2011-11-27 06:23:07 +01:00
snowleo f250a107e4 CB#1518 B#1042
Support for Enchantments & Removed broken BedFix (in cb now)
2011-11-27 06:01:41 +01:00
snowleo b35d5f30f9 Invert pattern 2011-11-23 02:52:08 +01:00
snowleo 8aaaed2ef8 More work on the config code 2011-11-23 02:43:38 +01:00
KHobbits e5a8cd88f0 Code cleanup continued. 2011-11-18 17:48:49 +00:00
snowleo 1cbd10a38e Moved all config options to new Settings classes 2011-10-19 17:52:07 +02:00
snowleo d3aaf3c14a New storage system for settings (WIP) 2011-10-13 01:40:11 +02:00