Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-13 04:47:09 +01:00
Code Issues Projects Releases Wiki Activity
605 Commits 6 Branches 0 Tags 107 MiB
c05e249440
Commit Graph

552 Commits

Author SHA1 Message Date
aPunch
f10944db9c fix 2012-02-28 07:27:33 -06:00
fullwall
cf5017644b Move file 2012-02-28 21:03:36 +08:00
fullwall
3a637dd234 Merge 2012-02-28 20:39:18 +08:00
fullwall
59dee87f38 Minor change 2012-02-28 20:38:08 +08:00
aPunch
7887cc8a7d ... 2012-02-28 06:22:20 -06:00
aPunch
6847b6dee2 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-02-28 06:18:57 -06:00
aPunch
c086e78ac2 fix more bugs 2012-02-28 06:18:19 -06:00
fullwall
333c4e35b4 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 20:11:37 +08:00
fullwall
e7cc81e44e Fix logic 2012-02-28 20:11:25 +08:00
aPunch
7ba3eac7fa fix another bug 2012-02-28 06:09:40 -06:00
aPunch
bb316d5af8 fix duping bug 2012-02-28 05:53:47 -06:00
fullwall
a6991c2dc2 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 19:28:16 +08:00
fullwall
517736403b Bugfix (may need changing later) 2012-02-28 19:25:42 +08:00
aPunch
42f9c0a07e finished equipment editor 2012-02-28 04:46:28 -06:00
aPunch
59ec5c4154 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-02-28 01:42:23 -06:00
aPunch
93cb0010ff added save command 2012-02-28 01:41:15 -06:00
fullwall
6b9004b142 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 15:39:21 +08:00
fullwall
1f74e7c244 Bugfix 2012-02-28 15:39:00 +08:00
aPunch
1bbe64181d editor changes, bug fixes 2012-02-27 09:59:39 -06:00
aPunch
410e227285 changes 2012-02-27 09:21:28 -06:00
fullwall
0d3d667f19 Minor change to Editor 2012-02-27 22:35:54 +08:00
fullwall
932c561a85 Remove derp! 2012-02-27 21:42:34 +08:00
fullwall
e46b9ce1a6 Fix build 2012-02-27 21:19:40 +08:00
fullwall
081c481036 Properly register character 2012-02-27 21:13:46 +08:00
fullwall
e600bdc7e2 Add temporary testing character 2012-02-27 21:01:38 +08:00
fullwall
b4089dc36a Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-27 19:17:10 +08:00
fullwall
75e718033a Waypoint work 2012-02-27 19:16:01 +08:00
aPunch
c77d5cb431 added reload command - do not use /reload 2012-02-27 04:59:33 -06:00
aPunch
bba2114f17 revert 2012-02-27 04:12:07 -06:00
aPunch
2e24b5b60f added mob type requirement to commands 2012-02-27 02:32:43 -06:00
aPunch
e5994c562c have set size for slimes/magma cubes, override chicken egg-laying 2012-02-26 21:12:14 -06:00
aPunch
63aec0d2dc change to remove command 2012-02-26 10:19:57 -06:00
aPunch
9da9c6c806 added owner command, fixed help menu bug 2012-02-26 03:42:55 -06:00
Ian Macali
3feb24b8c3 Fixed Maven. 2012-02-26 01:20:11 -06:00
aPunch
31cd3b8718 attempt to fix more world issues 2012-02-26 00:35:44 -06:00
aPunch
afc36bd307 listen to world unloading and loading 2012-02-25 23:23:43 -06:00
aPunch
c5fecea90b added license 2012-02-25 04:20:58 -06:00
aPunch
c2491d2df0 command and permission fixes 2012-02-25 01:57:04 -06:00
aPunch
100f256dcc changes to editors 2012-02-25 00:07:53 -06:00
aPunch
7dcb76d755 update to use EntityType instead of CreatureType 2012-02-23 17:45:45 -06:00
aPunch
8d2d825ac4 formatting 2012-02-23 05:17:15 -06:00
fullwall
0c5e75cef7 Update for file moves 2012-02-23 18:22:48 +08:00
fullwall
3d0e765367 Changes to waypoints 2012-02-23 18:10:38 +08:00
aPunch
6d282b971a command fixes and changes 2012-02-22 20:16:35 -06:00
aPunch
0abac86758 value flags no longer case-sensitive, remove debug message 2012-02-22 18:37:51 -06:00
aPunch
4720a4bd4d format 2012-02-22 17:59:51 -06:00
fullwall
7c28ca4807 Weak references for NavigationCallbacks 2012-02-22 22:05:28 +08:00
aPunch
0e3849ca63 added remove all command 2012-02-21 20:41:09 -06:00
aPunch
1d67c6ffcf added character permission wildcard 2012-02-21 19:59:55 -06:00
aPunch
5469138a69 revert permission change 2012-02-21 19:56:22 -06:00
aPunch
7acd56710c save location after teleport 2012-02-20 15:42:59 -06:00
aPunch
96cf0e23d4 format 2012-02-19 23:09:01 -06:00
aPunch
c991c863e1 added selection event 2012-02-19 23:05:49 -06:00
aPunch
ce99a9ed15 change to permissions - no longer need permission for each command, only need to be the owner or an admin 2012-02-19 22:19:05 -06:00
aPunch
b8f185e388 capacity cannot be so small 2012-02-19 18:40:25 -06:00
aPunch
0616bfa648 fix permission 2012-02-19 17:29:27 -06:00
aPunch
d410509da5 fix command NPE 2012-02-19 14:21:35 -06:00
aPunch
ed6d2590d0 fix teleporting NPE 2012-02-19 14:05:12 -06:00
aPunch
1e8375fb04 change to chunk loading/unloading 2012-02-19 11:45:43 -06:00
aPunch
2690a5d0aa admins can override ownership 2012-02-19 11:07:19 -06:00
aPunch
193a62896d remove tests temporarily 2012-02-19 10:08:41 -06:00
aPunch
d6a721ec66 added ability for NPCs to chat to one player only 2012-02-18 16:29:29 -06:00
aPunch
bf73bcc594 fix NPE 2012-02-18 12:47:57 -06:00
aPunch
ee35f698f8 change to selection, add /npc remove command for permanent removal 2012-02-17 22:53:28 -06:00
aPunch
f82119f702 fix commands 2012-02-17 21:25:17 -06:00
aPunch
0c2433b8ca added /npc 2012-02-17 18:37:33 -06:00
aPunch
bd8d5e5af5 added more messaging flags 2012-02-17 11:48:33 -06:00
fullwall
254f284352 Fix pom.xml 2012-02-17 15:48:20 +08:00
aPunch
1811422219 work now 2012-02-16 17:56:25 -06:00
aPunch
4a27008c70 work now 2012-02-16 17:48:07 -06:00
aPunch
5e08677dcc work now 2012-02-16 17:40:20 -06:00
aPunch
a73f995719 test jenkins 2012-02-16 17:33:01 -06:00
aPunch
958751f61f added temporary selection API until Bukkit adds metadata 2012-02-14 05:45:50 -06:00
fullwall
7d8f0fb9bb Revert "Changes to inventories" 
This reverts commit bca4ed1979.
 2012-02-14 19:38:44 +08:00
fullwall
bca4ed1979 Changes to inventories 2012-02-14 18:52:22 +08:00
aPunch
dcef6980f9 player tag for messages 2012-02-13 07:08:36 -06:00
fullwall
22979f819f Implement minecraft-like AI system 2012-02-13 19:48:38 +08:00
aPunch
872f51afa9 customizable chat prefix 2012-02-12 12:29:33 -06:00
aPunch
8314fb58db fix 2012-02-12 09:54:25 -06:00
aPunch
4956690096 fix metrics bug 2012-02-12 04:02:36 -06:00
aPunch
29a8728829 fix import errors 2012-02-12 02:00:19 -06:00
fullwall
b390f40ff5 Delete files 2012-02-12 15:20:08 +08:00
fullwall
f577cbae77 Metrics 2012-02-12 15:19:32 +08:00
fullwall
e4b31ae186 Merge branch 'master' of http://www.github.com/aPunch/Citizens2 2012-02-12 11:00:23 +08:00
fullwall
c7880e7515 Remove CommandIdentifier 2012-02-12 10:59:45 +08:00
aPunch
5cb46b6433 move storage to API for convenience 2012-02-11 10:33:36 -06:00
aPunch
42ae0e35ad removed Inventory from Citizens, added to API 2012-02-11 08:33:19 -06:00
aPunch
da7787720d change 2012-02-11 05:04:19 -06:00
aPunch
6dc01e57ab not working 2012-02-11 03:21:02 -06:00
aPunch
f01212036d command fix 2012-02-11 01:11:45 -06:00
aPunch
2fecee1113 added character setting command 2012-02-09 16:30:57 -06:00
aPunch
d6410781a5 shorten names when renaming NPC 2012-02-08 14:01:27 -06:00
aPunch
d511cafec4 Merge branch 'master' of github.com:aPunch/Citizens2 2012-02-08 09:35:18 -06:00
aPunch
3d4aae4ca4 really fix it this time 2012-02-08 09:32:38 -06:00
fullwall
da147f39f3 Merge branch 'master' of http://www.github.com/aPunch/Citizens2 2012-02-08 23:25:39 +08:00
aPunch
7c9c8dd546 added some commands, fixed bug where NPCs that despawned via chunk loading were deselected 2012-02-08 09:22:42 -06:00
fullwall
db8ce16adc Remove nested commands 2012-02-08 23:15:36 +08:00
aPunch
4a0d340755 added file headers 2012-02-08 06:07:17 -06:00
aPunch
46a2763a98 dynamic help menus 2012-02-08 02:26:14 -06:00
aPunch
2486d2188e use permission() in Command annotation 2012-02-07 05:31:22 -06:00
aPunch
01d073e6dd moved NPC rotation to LookClose trait, fix name color saving 2012-02-07 04:37:12 -06:00
fullwall
15214bd2c6 Runnables 2012-02-07 17:45:43 +08:00
aPunch
13ebcb54cc inventories now use the full name of an NPC 2012-02-07 02:31:28 -06:00
aPunch
b8bc6df251 whoops 2012-02-06 05:58:22 -06:00
aPunch
0fa8a6cc03 proper color-parsing for names 2012-02-06 05:55:29 -06:00
fullwall
5c2be032c3 Fixed up new command features + test 2012-02-06 16:30:45 +08:00
aPunch
4d40768a61 mob type is optional for create command 2012-02-05 07:02:47 -06:00
aPunch
a156c5f885 fixed bug 2012-02-05 05:31:08 -06:00
aPunch
170778ce37 items now save in the correct slot, enchantments are saved on inventory close 2012-02-05 05:26:55 -06:00
aPunch
10a9319aa4 disallow names greater than 16 characters in length as per vanilla spec 2012-02-05 04:24:11 -06:00
aPunch
368628094c saving inventories kind of works now 2012-02-05 04:08:24 -06:00
aPunch
589fd79b27 inventory work 2012-02-05 03:10:09 -06:00
fullwall
b0f72f24df ShowableInventory 2012-02-05 15:26:49 +08:00
aPunch
920804bd95 added inventory-related API 2012-02-05 01:18:40 -06:00
aPunch
30d003165c remove debug messages 2012-02-04 17:00:40 -06:00
aPunch
f15fb5b963 getTrait is safer 2012-02-04 16:58:40 -06:00
aPunch
0b1a3e8d60 removed duplicate files 2012-02-04 16:14:48 -06:00
fullwall
f467e54124 Command features 2012-02-04 23:26:06 +08:00
fullwall
1e3d3e5754 Revert to old socket, fix NPE 2012-02-04 22:49:16 +08:00
fullwall
1626b13d69 Override dragon + endermen AI 2012-02-04 22:31:16 +08:00
fullwall
ca3790fde1 Merge AIController and Navigator 2012-02-04 17:58:51 +08:00
aPunch
01fa072112 changes and bugfixes 2012-02-04 02:13:20 -06:00
fullwall
ad65534ac5 Change mob classes to static inner, add rudimentary pathfinder 2012-02-04 14:48:23 +08:00
aPunch
6bb38d534e registering traits no longer requires a String parameter 2012-02-03 17:44:18 -06:00
aPunch
4751dc0e9b attempt some better trait exception handling 2012-02-03 17:35:24 -06:00
aPunch
9830857d8d remove file 2012-02-03 03:21:16 -06:00
aPunch
6ff7b9b21a initial mob type NPCs implementation 2012-02-03 03:20:48 -06:00
aPunch
a06f245ed8 method name change 2012-01-30 17:44:12 -06:00
aPunch
078d71c08f bug fixes 2012-01-30 12:55:16 -06:00
fullwall
ee977e2ff8 Cleanup 2012-01-30 19:58:59 +08:00
aPunch
9728521ea7 added incompatibility error prevention 2012-01-29 14:58:19 -06:00
aPunch
b96e033f87 updated to Bukkit 1.1-R2 2012-01-29 13:29:23 -06:00
aPunch
26917d7f1c make sure mc entity is null when despawning 2012-01-29 13:14:10 -06:00
aPunch
3e03dfa35b added spawned trait 2012-01-29 12:23:42 -06:00
aPunch
14e1cf3ef4 added selection command, bug fixes 2012-01-29 11:52:50 -06:00
fullwall
bffd1d0329 Changes 2012-01-29 19:43:27 +08:00
aPunch
fefdc0a40f added some teleporting commands 2012-01-28 23:01:08 -06:00
aPunch
7a6b80ca58 fix? 2012-01-28 17:19:45 -06:00
aPunch
cdb89f4572 more bugfixes 2012-01-28 16:40:00 -06:00
aPunch
d689e71f96 bug fixes 2012-01-28 14:16:30 -06:00
fullwall
956ac3a28d Changes 2012-01-28 12:11:23 +08:00
aPunch
ad58821188 added command requirements and NPC owners 2012-01-26 15:08:32 -06:00
aPunch
8dd91596ae fixes and changes 2012-01-26 08:45:42 -06:00
aPunch
7fc22a2e27 fix reload bug 2012-01-25 17:09:02 -06:00
aPunch
0edd66c227 changes to commands 2012-01-25 14:40:01 -06:00
aPunch
ed38ef822e some more commands 2012-01-25 14:07:49 -06:00
aPunch
653e37ad24 initial command commit, needs lots of work 2012-01-25 09:29:54 -06:00
aPunch
573cc38497 remove debug test 2012-01-25 04:33:45 -06:00
aPunch
84858b2c23 added ability to send chat through an NPC 2012-01-25 04:32:24 -06:00
aPunch
3469f017f5 changes and fixes to character handling 2012-01-25 04:09:02 -06:00
aPunch
76d9b2b5c9 fix outofmemory error 2012-01-24 01:49:56 -06:00
aPunch
9a47aadedb properly remove NPC 2012-01-23 10:05:22 -06:00
aPunch
420302043a fix ID bug and others 2012-01-23 09:42:01 -06:00
aPunch
7ef3df8dfc added selection, needs work 2012-01-23 08:30:15 -06:00
fullwall
89d3dc13a1 AbstractNPC 2012-01-23 17:46:06 +08:00
fullwall
9bbb55435c Cleanup, add() method in ByIdArray 2012-01-23 16:45:34 +08:00
fullwall
26550bd7fe Forgot to put this back 2012-01-23 14:25:23 +08:00
fullwall
8071eb01f4 Merge CharacterManager and TraitManager 2012-01-23 14:12:45 +08:00
aPunch
891162e06e fix annoying spawning save bug 2012-01-22 11:43:58 -06:00
aPunch
039dbffd2e build "fixed" and other saving fix 2012-01-22 08:43:25 -06:00
aPunch
3ec65fb8ef more stubborn formatting 2012-01-22 08:23:25 -06:00
fullwall
0a5e84b1f0 Merge 2012-01-22 22:09:32 +08:00
fullwall
70187fda1e Add test, fix bug 2012-01-22 22:07:35 +08:00
aPunch
08e9a588b4 possible fix and lots of other changes 2012-01-22 07:48:50 -06:00
fullwall
6f155d21e0 Merge branch 'master' of http://www.github.com/aPunch/Citizens2 2012-01-22 16:04:27 +08:00
fullwall
f5f5b7b583 Change to ByIdArray 2012-01-22 16:04:10 +08:00
aPunch
8526671eaf more formatting again 2012-01-22 02:02:49 -06:00
aPunch
d996722643 more formatting 2012-01-22 01:58:02 -06:00
aPunch
f1bc5dba8f formatting fun 2012-01-22 01:52:46 -06:00
fullwall
c221abc75d Allow easier trait registration 2012-01-22 15:31:49 +08:00
fullwall
044c961522 Changes to trait api 2012-01-22 15:10:25 +08:00
aPunch
28a9b62c25 update for SpawnLocation trait 2012-01-21 10:21:21 -06:00
aPunch
5341487831 small change 2012-01-21 08:44:21 -06:00
aPunch
b5168ccef7 remove test setting 2012-01-21 07:57:57 -06:00
aPunch
fbf981e36a implemented settings 2012-01-21 07:56:50 -06:00
aPunch
b490a5e03b fix saving bugs 2012-01-21 06:53:58 -06:00
aPunch
6adc538b1e bugfixes 2012-01-20 09:15:32 -06:00
aPunch
48ae46ee77 bugfixes 2012-01-20 07:15:14 -06:00
aPunch
c65349e994 bugfixes 2012-01-20 01:48:55 -06:00
aPunch
6bcfcee30b traits should not load properly 2012-01-20 01:27:14 -06:00
aPunch
d7a5ce293f something 2012-01-19 06:21:04 -06:00
aPunch
acbecb8c56 use spaces 2012-01-19 05:43:21 -06:00
aPunch
51e0313cb6 refactor a bit 2012-01-19 04:52:58 -06:00
aPunch
c2b11b70c1 update to latest Bukkit event API 2012-01-19 01:38:40 -06:00
aPunch
1959d8c1a3 more saving work 2012-01-18 06:48:47 -06:00
aPunch
8ba1d49a00 use Entity instead of LivingEntity to avoid needing to cast 2012-01-18 04:47:13 -06:00
aPunch
28870818ba if you say it, do it! 2012-01-18 04:37:09 -06:00
aPunch
4503a6dce8 added some events 2012-01-18 04:35:15 -06:00
aPunch
21e985dc5d testing new Bukkit events 2012-01-17 22:04:08 -06:00
aPunch
8567c4ba3c switching to maven 2012-01-16 15:18:47 -06:00
aPunch
1533cd6eff implemented saving framework, messaging utils 2012-01-15 21:15:32 -06:00
aPunch
dbecb5763d fix bug 2012-01-15 13:33:49 -06:00
aPunch
d7d3d72856 format 2012-01-15 01:04:08 -06:00
aPunch
198e919d73 implemented more of the /lib/ 2012-01-15 01:00:04 -06:00
aPunch
9100fe4720 go back go back go back, go back to where we were 2012-01-14 23:09:31 -06:00
aPunch
75b17c652d added names 2012-01-14 22:41:02 -06:00
aPunch
566ab78f9c derp 2012-01-14 22:28:25 -06:00
aPunch
0514f24402 changes 2012-01-14 22:23:58 -06:00
aPunch
8893bba054 forgot something 2012-01-14 21:55:45 -06:00
aPunch
441d6f1eb1 added exceptions 2012-01-14 21:52:31 -06:00
aPunch
5b6d4710d5 call event elsewhere 2012-01-14 17:58:47 -06:00
aPunch
6ce73502e8 initial Citizens2 commit 2012-01-14 17:51:37 -06:00