Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-18 08:35:44 +01:00
Code Issues Projects Releases Wiki Activity
4,980 Commits 10 Branches 68 Tags 427 MiB
340baa9703
Commit Graph

165 Commits

Author SHA1 Message Date
snowleo
198b205d83 Fix unbreakable blocks 2011-06-23 15:57:52 +02:00
snowleo
9d6727daf2 Merge branch 'bukkitupdate' 
Conflicts:
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
 2011-06-23 13:49:37 +02:00
snowleo
7fc6d73241 Added TargetReasons of wolfs 2011-06-23 13:14:26 +02:00
snowleo
cdea68443a Only get data from valid rows 
Fixes #641
 2011-06-23 12:22:52 +02:00
snowleo
ebc56c0e15 Prevent lava bucket placed in air (far away from user) 
event.isCancelled() does not return the expected value
 2011-06-12 16:15:50 +02:00
snowleo
f0c503dd13 Another missing part 2011-06-12 14:54:56 +02:00
snowleo
bfa8b26661 The permission is essentials.protect.ownerinfo 2011-06-12 14:32:28 +02:00
ementalo
01f69b3f2b Protect: Remove protection when attached block is destroyed 2011-06-11 16:05:14 +01:00
ementalo
b974410dd9 Protect: Get block owners on right click block only 2011-06-11 08:37:05 +01:00
snowleo
b1446154bf Fix dependency 
Loading from lib won't work, so back to the old method.
 2011-06-07 21:55:31 +02:00
snowleo
a45e620946 Major cleanup of the Protect code 2011-06-06 22:29:08 +02:00
ementalo
f1b544a96f [trunk] Protect, add missing listener 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1587 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-06-05 21:36:47 +00:00
ementalo
9a4ef7cd20 [trunk] Protect, more merges 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1586 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-06-05 19:09:29 +00:00
ementalo
a005436510 [trunk] Protect, move some bits about 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1582 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-06-03 21:03:08 +00:00
ementalo
541fc51780 [trunk] Protect, merging changes in 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1581 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-06-03 20:56:29 +00:00
ementalo
e94a01b149 [trunk] Adding dependancy checker, need to fix timings as Protect tries to use it before the file system finishes 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1579 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-06-03 14:23:55 +00:00
ementalo
1a572bca2e [trunk] Fix the build, bundling the c3p0 jar inside protect for the moment 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1578 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-06-03 07:57:35 +00:00
ementalo
f6cedda1e2 [trunk] Protect refactors (formally known as 3.0) needs ***EXTENSIVE*** testing 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1574 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-06-02 23:09:59 +00:00
snowleo
8e151357ce Missed some parts for the last commits 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1555 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-06-01 11:26:12 +00:00
snowleo
0b8f6e2694 CB#812 
Fix for change in the minecraft class structure.
Do not use this yet!

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1538 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-26 14:50:13 +00:00
snowleo
1c5d9b1db0 cleanup 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1520 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-22 20:06:17 +00:00
snowleo
7ed87d696a cleanup 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1519 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-22 20:05:47 +00:00
snowleo
c51612d998 Added permissions to bypass EssentialsProtect damage protection. 
Change for admin!
Since we don't want to murder all admins, I added another permission:
essentials.protect.damage.disable
Since all admins get this by using '*', all those damage permissions are disabled
Don't use - -essentials.protect.damage.* as I stated in the last commit.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1479 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-15 12:33:17 +00:00
snowleo
a0b5e8d0f8 Added permissions to bypass EssentialsProtect damage protection. 
As admin you want to disable this with
- -essentials.protect.damage.*

New permissions:
essentials.protect.damage.contact
essentials.protect.damage.lava
essentials.protect.damage.tnt
essentials.protect.damage.creeper
essentials.protect.damage.projectiles
essentials.protect.damage.fall
essentials.protect.damage.suffocation
essentials.protect.damage.fire
essentials.protect.damage.drowning
essentials.protect.damage.lightning

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1476 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-15 12:10:24 +00:00
snowleo
ea52e817b5 Move Register stuff inside Essentials 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1454 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-13 23:39:18 +00:00
snowleo
cf86a79f1f Add Register as dependency for all projects. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1453 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-13 23:14:03 +00:00
snowleo
f315bbe43c Finally get rid of all dependency problems. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1423 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-11 22:30:34 +00:00
snowleo
106a44d3a0 IConfExternal is abstract class for other jars, because the interface is not accessible. 
Forgot to remove the import.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1419 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-10 22:02:42 +00:00
snowleo
a2ed8ea52a IConfExternal is abstract class for other jars, because the interface is not accessible. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1417 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-10 21:53:27 +00:00
snowleo
48409fd9ea Fix EssentialsProtect not loading correctly, because Essentials is not loaded first. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1414 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-10 21:34:01 +00:00
snowleo
300f9c33cc Reload Users and Protect on /essentials reload. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1411 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-10 21:14:38 +00:00
snowleo
e846093fd0 More translation stuff. Translated Spawn, Chat, Protect, GeoIP 
Protect is only partly translated (sql stuff is not translated)
EssentialsSpawn is changed to use the onCommand from Essentials jar, since that is more up to date.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1408 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-10 19:57:59 +00:00
ementalo
5051bcb383 [trunk] EssentialsProtect :- fix owner spam on arm swing, will only show on right-click now 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1346 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-05 00:05:22 +00:00
ementalo
11740c49bc [trunk/protect] Adding warning for changes coming soon to protect in regards to worldguard 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1332 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-03 21:37:36 +00:00
snowleo
79c0ef69c4 Cleanup of the iConomyBridge Code 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1321 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-02 18:22:17 +00:00
snowleo
224c18348a This is a big refactoring of the user class and more. 
Many commands have been cleaned.

File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.

Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax

New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added

Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
-  time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-05-01 21:07:30 +00:00
ementalo
2ccc2234d4 [trunk] added new config settings to disable weather. you can disable storm / thunder and lightning seperately. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1284 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-27 01:33:45 +00:00
ementalo
63f2eb157a [trunk] cleanup, prevent lightning fire spread 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1280 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-26 21:36:51 +00:00
snowleo
983af7b476 CB 731 
Adding new craftbukkit because it fixes one of the bugs I reported.

Mysql and sqlite are included in craftbukkit, we don't need to add the libs to our jars.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1272 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-26 02:05:22 +00:00
snowleo
a86fbddc61 CB 697 
Fixes spawning of web and new rails.
New config: Disable Lightning damage for players.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1258 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-21 16:58:02 +00:00
snowleo
f1f3d2fec5 Craftbukkit 689 / MC 1.5 
Testing only, do not release until 689 or higher is recommended

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1247 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-21 09:33:25 +00:00
snowleo
8ea366d8bb Updated build-impl by Netbeans 7.0 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1246 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-21 09:29:31 +00:00
snowleo
8ac6f92250 [trunk] Removed useless loadClasses() method from Essentials. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1216 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-16 13:38:02 +00:00
ementalo
60bf78040c [trunk] fix setting for prevent-block-on-rails 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1200 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-15 21:56:40 +00:00
ementalo
2b1164f021 [trunk] add setting warn-on-build-disallow to protect. setting this will give users with build:false a warning 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1189 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-14 21:14:16 +00:00
snowleo
0c0a8b2602 [trunk] Protect: new prevent.portal-creation 
If enabled, players can't create portals using fire.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1177 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-11 10:49:45 +00:00
snowleo
44de35240d [trunk] Backported some code from 3.0 branch: Correct the protection of signs and rails. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1163 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-10 18:17:53 +00:00
snowleo
76ba31d1a3 [trunk] New permission essentials.protect.ownerinfo shows the owner of each block, was essentials.protect.admin before. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1158 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-08 16:35:32 +00:00
snowleo
12b1b7c85a [trunk] Monster don't target players. 
new config: protect.prevent.entitytarget
new permission: essentials.protect.entitytarget.bypass

typo

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1146 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-07 20:37:48 +00:00
snowleo
79bd8d0b2c [trunk] Monster don't target players. 
new config: protect.prevent.entitytarget
new permission: essentials.protect.entitytarget.bypass

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1145 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-07 20:32:00 +00:00
snowleo
3496a85228 [trunk] Prevent explosions near protected objects 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1091 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-02 02:43:58 +00:00
snowleo
3c59ec9c58 [trunk] Item lists in settings are now stored as Integer lists. 
Also: Names from items.csv now work in item lists.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1084 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-01 22:06:00 +00:00
snowleo
40f6247aad [trunk] Correcting path for c3p0 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1059 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-01 01:21:30 +00:00
snowleo
f9f5e427bc [trunk] Remove private directories. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1055 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-04-01 00:18:15 +00:00
ementalo
65312004df NULL item is when we click on stuff like doors. 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1053 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-31 22:39:08 +00:00
ementalo
fb80869961 Fix NPE where players trigger creature spawn 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1052 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-31 22:20:53 +00:00
Zenexer
17b3c793d9 Updated for CB 602 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1043 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-30 17:58:00 +00:00
Zenexer
c0ab3e290e git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1038 e251c2fe-e539-e718-e476-b85c1f46cddb 2011-03-30 16:38:56 +00:00
ementalo
2b66459bce remove 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1037 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-30 14:31:54 +00:00
ementalo
243ff48778 gah 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1036 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-30 14:28:46 +00:00
ementalo
c2f7853ec9 2.1 v 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1035 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-30 14:22:14 +00:00
Zenexer
441b8ad926 Deprecated Serverlist 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1030 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-30 13:39:00 +00:00
snowleo
08041599ff Revert to 1013 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1021 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-30 12:56:34 +00:00
Zenexer
81c9b91561 Updated merged jars to add c3p0 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1020 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-30 12:22:10 +00:00
Zenexer
cb21bc4d7a 2.1 prerelease, part 2 of 3 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk2.1@1015 e251c2fe-e539-e718-e476-b85c1f46cddb
 2011-03-30 04:03:21 +00:00