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
130 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
snowleo f46948249e Updated Essentials to work with R5 2012-02-21 17:33:46 +01:00
snowleo 8ab5bad988 Modified BetterLocation, and new Permission-System 2012-02-05 17:19:32 +01:00
KHobbits f4413633b8 Clean more imports. 2012-01-28 13:48:30 +00:00
KHobbits 9b58b2b9c0 Revert emergency listener to old style 
Stops peoples world world burning down if they throw in 2.8, on a 1.0 server.
 2012-01-26 21:21:13 +00:00
KHobbits c689b55c4d Fix depends 2012-01-25 23:56:54 +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
ementalo 01a37df700 Add new permission essentials.protect.alerts.notrigger 
If user has this permisson they do not trigger EssProtect block alerts
Fix spawnmob sign command args
 2012-01-23 16:00:23 +00:00
ementalo f93769dd1d Add new permission essentials.protect.alerts.notrigger 
If user has this permisson they do not trigger EssProtect block alerts
 2012-01-23 15:48:56 +00:00
snowleo e46fe381b4 Removing load info, bucket displays that now. 2012-01-20 05:52:35 +01:00
snowleo 792f70efa5 Update for new CraftBukkit Event Code 
EssentialsSpawn can't be updated yet, because the new event system lacks dynamic priorities.
 2012-01-20 05:20:37 +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
snowleo 91563e9dca Optimize Break in Protect 2012-01-16 01:55:04 +01:00
snowleo eb5c88ef08 Netbeans 7.1 stuff 2012-01-12 23:37:39 +01:00
snowleo 703c5741bd Essentials should run now... 2012-01-10 01:02:23 +01:00
snowleo d64c73fc51 Finished Protect, Essentials should build now. 2012-01-10 00:36:09 +01:00
snowleo 801562ac2c More work on Protect 2012-01-03 02:51:19 +01:00
snowleo 869d79ae73 This feels so good D: 2012-01-03 01:53:38 +01:00
snowleo 7153676137 Starting to break Protect 2012-01-03 00:07:44 +01:00
snowleo d2c1b24e4b Prototype for grouping permissions into an enum 2012-01-02 23:45:50 +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
snowleo 5002e7a6ad Prevent blockdamage by enderdragon (default true) in EssentialsProtect CB#1566 B#1058 2011-12-08 00:48:53 +01:00
snowleo e6e1c7d160 We don't need them anymore. 2011-12-01 01:56:39 +01: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 bd7bd86e62 Allow EssentialsProtect to go into emergency mode, if Essentials core is not present at all. 2011-11-30 21:25:11 +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 e8d64aca5e New option for EssProtect: Prevent villager death. 2011-11-28 06:15:51 +01:00
snowleo 63991cb38d Moved all dependency on craftbukkit to one package in the main jar. The rest is now clean bukkit code. Also cleaned PlayerExtension class. 2011-11-22 03:02:08 +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 1e4a54baca Prevent NPE with creatures that are not added to bucket yet. 2011-11-20 16:50:08 +01:00
snowleo a886645afa Add SmallFireball to EssProtect 2011-11-20 15:43:39 +01:00
snowleo c132a75c1a CB# 1467 B#1022 2011-11-20 14:03:00 +01:00
snowleo 41c03853ab General fix against overwriting already existing protections 2011-11-17 17:06:06 +01:00
snowleo 2a4c26ee69 Prevent that sign protection in EssProtect can be circumvented by placing signs. 2011-11-17 16:20:31 +01:00
snowleo af5a86c48c Fix water/lava bucket bug with mobs 2011-11-17 14:23:35 +01:00
snowleo a0031d1d45 New config setting: protect.prevent.enderman-pickup 
Defaults to false
 2011-09-21 02:30:58 +02:00
snowleo 322ecdb9fc Less use of Craftbukkit code, so less things will break on MC update. 
Added try/catch around the tnt and creeper protection code. The event will now always canceled, even if our fake explosion code fails.
 2011-08-27 20:39:54 +02:00
snowleo d3302dea00 Protect detector/powered rails 2011-08-27 17:11:15 +02:00
snowleo 65be2dba99 Protect detector/powered rails 2011-08-27 17:09:43 +02:00
snowleo 8281908306 PVP protection for arrows and other projectiles. Needs cleanup. 2011-08-26 04:46:08 +02:00
snowleo af248a1d2e Wait 1 second after deactivation of protect to allow the database to close. 2011-08-21 21:27:22 +02:00
snowleo 33d37a2f96 Revert "Prevent closing already closed statements" 
This reverts commit b9fc6a0b2b.
 2011-08-08 18:14:20 +02:00
snowleo b9fc6a0b2b Prevent closing already closed statements 2011-08-08 15:56:23 +02:00
snowleo 9a893f65fe Changes to build-impl by Netbeans 2011-08-08 14:40:39 +02:00
snowleo bc1c252dca Correcting all line endings to LF 2011-07-24 23:19:12 +02:00