upstream/Essentials
2
0 Fork 1
mirror of https://github.com/EssentialsX/Essentials.git synced 2026-11-07 01:42:35 -05:00
Code Releases 1 Activity
1,992 Commits 6 Branches 72 Tags
precomponent
Commit Graph
79 Commits
Author SHA1 Message Date
snowleo 4da3f52164 Merge branch 'refs/heads/master' into 3.0 
Conflicts:
	.gitignore
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/EssentialsTimer.java
	Essentials/src/com/earth2me/essentials/ISettings.java
	Essentials/src/com/earth2me/essentials/Jails.java
	Essentials/src/com/earth2me/essentials/OfflinePlayer.java
	Essentials/src/com/earth2me/essentials/Settings.java
	Essentials/src/com/earth2me/essentials/User.java
	Essentials/src/com/earth2me/essentials/UserData.java
	Essentials/src/com/earth2me/essentials/UserMap.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/commands/Commandnear.java
	Essentials/src/com/earth2me/essentials/commands/Commandping.java
	Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
	Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
	Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
	Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
	Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
	Essentials/src/messages_en.properties
	Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
	Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java
	EssentialsChat/src/plugin.yml
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
 2012-02-21 18:34:53 +01:00
KHobbits 945ae71480 Adding full keyword support for newb join message. 
Also adding {ADDRESS} and {USERNAME} as new keywords.
 2012-02-18 21:09:18 +00:00
snowleo 539700cb21 New Groups code, supports groups.yml file, gm and vault, new economy api. 2012-02-06 22:13:39 +01:00
snowleo 8ab5bad988 Modified BetterLocation, and new Permission-System 2012-02-05 17:19:32 +01:00
KHobbits 8080abacd6 More general cleanup. 2012-01-28 14:17:27 +00:00
KHobbits e960078e1a Random Cleanup 2012-01-28 14:05:50 +00:00
KHobbits 36d7907987 Fix missing import. 2012-01-28 13:40:10 +00:00
KHobbits 047f373631 Merge branch 'master' into 3.0 
Conflicts:
	Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java
	Essentials/src/com/earth2me/essentials/commands/Commandhome.java
	Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
	Essentials/src/messages_fr.properties
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
 2012-01-28 13:33:09 +00:00
KHobbits d1d31e9769 If bed home is set, give priority when spawning. 2012-01-28 00:57:08 +00:00
KHobbits f7c6759433 Check bed still exist, for bed homes. 2012-01-28 00:49:22 +00:00
KHobbits 5137502646 Switch website URL's to point at wiki. 2012-01-28 00:20:46 +00:00
KHobbits c689b55c4d Fix depends 2012-01-25 23:56:54 +00:00
ementalo 307c6c7bf0 remove merge leftovers 
Don't try to spawn users who have disconnected before we have a chance to spawn them
 2012-01-24 22:50:34 +00:00
ementalo 593cb8d56e Don't try to spawn users who have disconnected before we have a chance to spawn them 2012-01-24 22:43:33 +00:00
snowleo cc0e9aa84b Merge branch 'refs/heads/master' into 3.0 
The changes to EssChat have not been merged

Conflicts:
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
	Essentials/src/com/earth2me/essentials/ISettings.java
	Essentials/src/com/earth2me/essentials/OfflinePlayer.java
	Essentials/src/com/earth2me/essentials/Settings.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
	Essentials/src/messages.properties
	Essentials/src/messages_da.properties
	Essentials/src/messages_de.properties
	Essentials/src/messages_en.properties
	Essentials/src/messages_es.properties
	Essentials/src/messages_fr.properties
	Essentials/src/messages_nl.properties
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
	EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
	EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
	EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
	EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
 2012-01-24 00:52:08 +01:00
snowleo e46fe381b4 Removing load info, bucket displays that now. 2012-01-20 05:52:35 +01:00
snowleo 04a43eb5d0 New Event code for EssentialsSpawn 2012-01-20 05:34:28 +01:00
snowleo f0dd81ee00 Merge branch 'refs/heads/master' into 3.0 
Did some tweaks, so that it actually works.

Conflicts:
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/User.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java
	Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
	Essentials/src/com/earth2me/essentials/commands/Commandmail.java
	Essentials/src/com/earth2me/essentials/commands/Commandme.java
	Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
	Essentials/src/com/earth2me/essentials/commands/Commandnick.java
	Essentials/src/com/earth2me/essentials/commands/Commandr.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
	build.xml
 2012-01-18 04:01:01 +01:00
KHobbits 43f1c0f89d Removing debugging messages. 2012-01-13 22:50:48 +00:00
KHobbits 256d202d50 Adjusting default spawn behavior. 
Moving option in config file.
 2012-01-13 22:41:47 +00:00
snowleo eb5c88ef08 Netbeans 7.1 stuff 2012-01-12 23:37:39 +01:00
KHobbits 3513d72a7b Fixing Warp, Spawnmob signs 
Fix Imports
 2012-01-04 21:41:05 +00:00
snowleo a552b88172 I always forget these 2012-01-03 02:53:57 +01:00
snowleo 41e0e64a5f EssentialsSpawn and EssentialsChat should build now again 2012-01-02 22:38:47 +01:00
snowleo a20e96af4e Netbeans 7.1 RC2 project stuff 2012-01-02 22:37:44 +01:00
snowleo 0155bcedb7 Updated all modules to new api, some settings are still missing 2011-12-14 16:31:08 +01:00
snowleo 0f1eb9b4f9 Moved signs code to a new module 2011-12-14 16:04:15 +01:00
KHobbits faddbd09a4 Update copylibs. 2011-12-13 03:11:11 +00:00
KHobbits 5f3d783e21 Update Bukkit jars and paths. 2011-12-12 22:45:59 +00:00
KHobbits 06c2453941 Update plugin information. 2011-12-09 21:51:31 +00:00
KHobbits 9410a25cce Adjusting /spawn to not trigger respawn event. 2011-12-08 02:21:10 +00:00
snowleo 02b25120e8 Allow to set the Respawn priority in config. 2011-12-07 15:09:22 +01:00
snowleo ef49d92c49 Null check in new player teleport, fixes #1212 2011-12-07 10:37:34 +01:00
ementalo 10597cec2f Catch TeleportClause.COMMAND in the teleport listener. 
Changed Teleport methods to pass a TeleportClause param
 2011-12-07 01:12:36 +00: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 ad60eb538e Ignore teleport cooldown on /tjail 2011-12-04 22:57:40 +01:00
snowleo c8814bd70e Added missing [player] to plugin.yml 2011-12-04 22:10:20 +01:00
snowleo 8417c5e1f0 New permission essentials.spawn.others 2011-12-04 22:09:36 +01:00
Khyperia ba3ccf7a2c Added /spawn <player> 
Test #607
 2011-12-03 20:24:35 -05:00
snowleo 4f8be31343 Cleanup of the library folder 
Also: we don't use the mysql.jar/sqlite.jar anymore, since it is included in craftbukkit. I don't know why this reference in config.yml still exists.
 2011-12-01 01:35:48 +01:00
snowleo 5e2123c91e If Essentials core fails to read one of the configs now, it will disable itself. If other modules detect that Essentials is not enabled, they will be disabled too. EssentialsProtect will go into emergency mode, canceling all events that could hurt your world. Fix the file and either restart or reload the server. 2011-11-30 20:49:11 +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 65776d6ed2 BedLocationFix for CraftBukkit 2011-11-27 04:46:33 +01:00
snowleo b21b7b7e15 New behavior of the /home command and beds 
- The behavior has been altered to match the vanilla server.
 - Using a bed will no longer create a home in the users file, if config option bed-sethome is set
 - The config option bed-sethome has been removed
 - It's now possible to go to /home bed or /home playername:bed
 - Bed locations stored before installing Essentials will be used
 - Players respawn at their bed location (if set) instead of the spawn, if respawn-at-home is set to false
 - The default value of spawn-if-no-home is set to true
 - If spawn-if-no-home is set and the player has not set a home, he will be either teleported to his bed location (if set) or the spawn, when he uses the /home command
 2011-11-26 22:30:40 +01:00
snowleo 220d68f375 Switch to the new I18n class and format cleanup of all classes 2011-11-21 02:55:26 +01:00
snowleo c132a75c1a CB# 1467 B#1022 2011-11-20 14:03:00 +01:00
snowleo fb211d722c Prevent that hidden players broadcast afk messages 
Prevent that moving players triggers unafk too early, they can now move within a radius of 3 blocks from the position where they went afk.
 2011-09-02 16:16:15 +02:00
snowleo 5a5dc933ad Forgot this one 2011-08-27 23:38:21 +02:00