13565 Commits

Author SHA1 Message Date
Exultant
8758f18fe9 Fixed typo.
Signed-off-by: Exultant <insane.au@gmail.com>
2012-10-22 19:39:42 +11:00
Exultant
6a3020699e Added CommandUtils class and attempted fix to Moderator/Member page view bug.
Signed-off-by: Exultant <insane.au@gmail.com>
2012-10-22 19:31:21 +11:00
Exultant
3a0fb020cb Improve ctgstats command, Add ctpstats command.
Signed-off-by: Exultant <insane.au@gmail.com>
2012-10-22 19:17:15 +11:00
Exultant
e2f59499e3 Added testing version of ctgstats command.
Signed-off-by: Exultant <insane.au@gmail.com>
2012-10-22 14:10:35 +11:00
erocs
5b1e85b187 Remove chunk log spam 2012-10-21 19:56:55 -07:00
Justin
4edffeb393 Merge pull request #78 from erocs/master
Fix TnT/Creeper explosion with natural reinforcements
2012-10-21 19:45:22 -07:00
erocs
b0bc2c4520 Fix TnT/Creeper explosion with natural reinforcements 2012-10-21 19:42:12 -07:00
Justin
bb9524338c Merge pull request #77 from erocs/master
Refactor natural reinforcements and fix caching
2012-10-21 19:23:48 -07:00
erocs
52183a1717 Refactor natural materials.
Fix cache bugs.
2012-10-21 17:18:32 -07:00
Justin
646ef7039f Merge pull request #72 from erocs/master
Issue#71 Naturally reinforced blocks
2012-10-19 05:18:20 -07:00
erocs
d6ed1f645a Add custom block ID support to hardened material configuration to support
other plugins.
2012-10-18 23:12:05 -07:00
erocs
e19c72158d Merge github.com:interfect/Citadel 2012-10-18 22:55:02 -07:00
Erocs
6600772c03 Issue#71 Naturally reinforced blocks
Added the ability to configure reinforcement per material types for blocks
 generated across the map. This reinforcement is different than player
 reinforced blocks as it is done automatically in the DAO cache when a
 block of a configured material type is first broken. This type of
 reinforcement does NOT get saved to the database.

The configuration is simple:
  hardenedMaterials:
    IRON_ORE: 3
    DIAMOND_ORE: 10
This configuration would cause Iron Ore blocks to require breaking 3 times
 before they actually broke. As you can guess, the second material defined
 here would cause diamond ore to require 10 breaks.

I will add that the Reinforcement class should be refactored into
 IReinforcement, PlayerReinforcement, and EnvironmentalReinforcement so
 that this type of reinforcement, with how it is added here, isn't as
 kludgey in the code.
2012-10-18 00:28:56 -07:00
Exultant
237767b316 Updated external access code.
Signed-off-by: Exultant <insane.au@gmail.com>
2012-10-11 17:17:36 +11:00
Exultant
01dd3f4202 Merge branch 'master' of https://github.com/Exultant/Citadel 2012-10-11 16:25:27 +11:00
Exultant
c552403bea Added code to allow other plugins to access Citadel reinforcements more easily.
Signed-off-by: Exultant <insane.au@gmail.com>
2012-10-11 16:24:20 +11:00
Justin
1251afa19a Merge pull request #68 from uncorr/master
Removed infinite diamond exploit
2012-10-10 05:17:01 -07:00
Charles Smith
a7eb85ce36 Removed infinite diamond exploit
Typo prevented removed reinforcements from actually being removed,
allowing players to harvest infinite diamond with a sand glitch.  That's
removed now and chunks caches now accurately remove reinforcements.
2012-10-09 21:47:40 -07:00
Justin
ce343f2877 Merge pull request #67 from theliet/master
Jenkins now correctly builds Citadel using Maven
2012-10-02 14:42:10 -07:00
Dominik Stozek
5a95729029 No hyphen in CP1252 2012-10-02 22:40:42 +02:00
Dominik Stozek
b6af4f0dd4 Use CP-1252 encoding for source code in Maven builds 2012-10-02 22:38:23 +02:00
Dominik Stozek
16a6b84e42 Abandon encoding info altogether 2012-10-02 22:36:15 +02:00
Dominik Stozek
4dc03e541f Use a different encoding for Maven builds 2012-10-02 22:34:39 +02:00
Dominik Stozek
30c97650a6 Force Maven compiler plugin version and JDK version 2012-10-02 22:30:40 +02:00
Dominik Stozek
a1fd444ba2 Force maven compiler plugin version 2012-10-02 22:21:41 +02:00
Justin
26972a96d6 Merge pull request #66 from theliet/master
Update Maven's pom.xml for Jenkins builds
2012-10-02 12:34:39 -07:00
Dominik Stozek
665eb84c08 Updated Maven's pom.xml for Jenkins builds
I'm working on a Jenkins CI server for Citadel. Jenkins can use Maven
for building projects. This update sets up Citadel for proper Jenkins
builds.
2012-10-02 21:29:53 +02:00
Justin
9cfbebf1e9 Merge pull request #64 from uncorr/master
Preliminary bugfix
2012-09-30 12:17:04 -07:00
Charles Smith
513cc400cf Preliminary bugfix
A modicum of testing is done and many bugs have been fixed.  I'm not
confident about groups since groups were added after my day.
Project-wise consistency of tabs and spaces is deferred until next
change.to avoid confusion.  Whimsical naming removed.
2012-09-29 18:50:02 -07:00
Charles Smith
c6a5ebbb33 Revert "Revert "Bug fix""
This reverts commit b307766083.
2012-09-29 13:56:32 -07:00
Charles Smith
b307766083 Revert "Bug fix"
This reverts commit 77fe240f3b.
2012-09-29 13:34:41 -07:00
Charles Smith
77fe240f3b Bug fix
Very minimal testing has been done, but Citadel is now no longer a
steaming heap of bricks.  Aside from fixing bugs, I've changed tabs to 4
spaces in both Citadel.java and my Dao extension.
2012-09-29 13:21:11 -07:00
Justin
e08cde5ac5 Merge pull request #59 from uncorr/master
Adding chunk-wise RAM caching, Lets get this tested and on the production server ASAP.
2012-09-19 05:14:57 -07:00
Charles Smith
d0bdc8e3ca RAM caching & relative library path
RAM caching is added by extending CitadelDao.  When the plugin wants to
query the database about a block, CitadelCachingDao transparantly loads
all the reinforcement data in the same chunk as that block into the RAM,
if it's not cached already.  If changes are made to reinforcements on a
cached chunk, those changes are consolidated in ram so there'll only be
hd read/write when chunks are loaded/unloaded from the RAM cache.  When
new chunks are loaded into RAM, all chunks older than an age given in
the config are released (and therefore flushed).  There's a hard limit
to the amount of chunks that can be held in RAM (to make
resource-wasting griefing impossible) and when that limit is met, the
entire cache is bypassed (to prevent thrashing).

Right now this is completely untested, I haven't set up MySQL yet.

Also, the craftbukkit library is now local and included relatively for
ease of development.
2012-09-19 00:43:14 -07:00
anovak
7210dc1d9d Changing <?> characters to subsection signs, like they should be.
Encoding issue with my build environment?
2012-09-07 19:21:10 -07:00
anovak
fa5b288cb4 Added support for integer id numbers as nonReinforceables and as
additional secureables.
2012-09-07 13:51:36 -07:00
anovak
7113a0de65 Added ability to specify reinforcement and flash materials by number
(not X123, just 123).
Damage values are not supported.

This is mostly for enabling items from mods to be used as reinforcement
materials, as those don't show up in the Materials enum.
2012-09-06 02:04:22 -07:00
Josvth (Laptop)
f3056cee93 Removed commented method. 2012-09-04 15:37:08 +02:00
Josvth
b81c6eb0f2 Fixed circular spawn area calculations. 2012-09-02 21:19:32 +02:00
Josvth
5d5b698ca7 Changed all integers to doubles. Fixed circular spawn area's. 2012-09-02 21:19:04 +02:00
Justin
74a5661be5 Merge pull request #53 from remyroy/master
Fix for issue #52 Fortified rails do not resist lava.
2012-09-01 05:31:30 -07:00
Rémy Roy
aed9fc4e9c Adding protection for reinforced rails from lava. Rails still get their protection reduced from lava. 2012-09-01 02:51:08 -04:00
Josvth
dac8c64220 Removed default block blacklist. 2012-08-29 19:17:32 +02:00
Josvth
28b8ee0c00 Removed default spawn blacklist. Added circular spawn areas. Made spawn
selector a little bit more efficient.
2012-08-29 19:17:13 +02:00
Jonathan Devine
4ec1097de6 Merge pull request #50 from intangir/master
Fix: Issue #35 /ctf mode double placement cost
2012-08-12 17:34:04 -07:00
Jonathan Devine
53c25b1cdd Merge pull request #49 from JonnyD/master
Fixed: Redstone not opening doors.
2012-08-12 17:33:27 -07:00
Jonathan Devine
4573b9bede Fixed: public reinforced openable blocks were not accessible to anyone. 2012-08-13 01:30:17 +01:00
Jonathan Devine
837aa5685e implemented mcstats.org metrics 2012-08-13 01:29:36 +01:00
JonnyD
0b4d7de57e added a user friendly stack trace 2012-08-13 01:29:07 +01:00
Intangir
2a1b1c7e58 removed double removeitem (the normal event handler already removes one) 2012-08-12 18:44:40 -05:00