Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-24 19:46:15 +01:00
Code Issues Projects Releases Wiki Activity
577 Commits 6 Branches 0 Tags 106 MiB
5b380cf96e
Commit Graph

528 Commits

Author SHA1 Message Date
fullwall
29100190a7 Attempted fixes 2012-03-02 19:39:47 +08:00
fullwall
5af2a7ee84 Fix? 2012-03-02 19:20:38 +08:00
fullwall
b019763675 Merge selection fix 2012-03-02 19:10:46 +08:00
fullwall
bc946e0892 Don't keep chunk references around 2012-03-02 18:59:40 +08:00
fullwall
feb0ccd445 Merge 2012-03-02 18:38:39 +08:00
fullwall
b26a495aff Changes to waypoints 2012-03-02 18:36:54 +08:00
aPunch
9448d1a102 fix selection issue 2012-03-02 04:19:18 -06:00
aPunch
3d4c02dfea update to new mob AI 2012-03-02 03:59:02 -06:00
aPunch
89197d3acb completely implement iron golem and ocelot NPCs 2012-03-01 12:22:39 -06:00
aPunch
d2cbf96596 add new entities, wont work until Bukkit adds API for them 2012-03-01 10:13:37 -06:00
fullwall
d2e7064d44 Update to 1.2 2012-03-01 23:12:47 +08:00
aPunch
70136caa8e change to inventory naming 2012-03-01 06:07:54 -06:00
aPunch
7cb2e5be9d updated to latest Bukkit and Craftbukkit 2012-03-01 04:45:44 -06:00
aPunch
ba923a066b added ability to list all NPCs 2012-02-29 07:23:22 -06:00
aPunch
3d3c4bcf3f added permission to plugin.yml 2012-02-29 07:11:51 -06:00
aPunch
c2a23fd517 added list command 2012-02-29 07:05:25 -06:00
aPunch
9b6f1968d2 separate pagination out 2012-02-29 05:39:08 -06:00
aPunch
b8b240700d change to commands 2012-02-29 04:50:45 -06:00
aPunch
4273c8fcfa changes 2012-02-28 09:12:18 -06:00
fullwall
b57cd60285 Remerge 2012-02-28 22:33:38 +08:00
fullwall
5e2ea74f1b Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 22:30:26 +08:00
fullwall
8cb6fa9862 Change to pathfinding 2012-02-28 22:30:02 +08:00
aPunch
f339368367 equip fix 2012-02-28 08:29:40 -06:00
fullwall
6b4bbc62ed Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 22:18:24 +08:00
fullwall
f89aac853d Fix some bugs 2012-02-28 22:17:49 +08:00
aPunch
03725cba9b color change 2012-02-28 07:47:44 -06:00
aPunch
3ca49572f9 fix 2012-02-28 07:27:33 -06:00
fullwall
816545cf59 Move file 2012-02-28 21:03:36 +08:00
fullwall
056e0a920d Merge 2012-02-28 20:39:18 +08:00
fullwall
c741cf08d6 Minor change 2012-02-28 20:38:08 +08:00
aPunch
9fd75d10bf ... 2012-02-28 06:22:20 -06:00
aPunch
f6b7bfe816 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-02-28 06:18:57 -06:00
aPunch
744eab6953 fix more bugs 2012-02-28 06:18:19 -06:00
fullwall
96ea7fe363 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 20:11:37 +08:00
fullwall
d1fc04e9ec Fix logic 2012-02-28 20:11:25 +08:00
aPunch
1bb90ae533 fix another bug 2012-02-28 06:09:40 -06:00
aPunch
f6f655b15c fix duping bug 2012-02-28 05:53:47 -06:00
fullwall
a795111e1d Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 19:28:16 +08:00
fullwall
f42248a38e Bugfix (may need changing later) 2012-02-28 19:25:42 +08:00
aPunch
25ad97f37e finished equipment editor 2012-02-28 04:46:28 -06:00
aPunch
bf7b868a09 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-02-28 01:42:23 -06:00
aPunch
5d56f6edc4 added save command 2012-02-28 01:41:15 -06:00
fullwall
bb37e033b9 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 15:39:21 +08:00
fullwall
5f8c8aafc3 Bugfix 2012-02-28 15:39:00 +08:00
aPunch
c188d2833e editor changes, bug fixes 2012-02-27 09:59:39 -06:00
aPunch
a4b1858c3a changes 2012-02-27 09:21:28 -06:00
fullwall
164d7467ad Minor change to Editor 2012-02-27 22:35:54 +08:00
fullwall
0ef4192769 Remove derp! 2012-02-27 21:42:34 +08:00
fullwall
abcf43dd9f Fix build 2012-02-27 21:19:40 +08:00
fullwall
7bd412f646 Properly register character 2012-02-27 21:13:46 +08:00
fullwall
6972dba611 Add temporary testing character 2012-02-27 21:01:38 +08:00
fullwall
ccf0b14547 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-27 19:17:10 +08:00
fullwall
965277121d Waypoint work 2012-02-27 19:16:01 +08:00
aPunch
5e5fb2af4c added reload command - do not use /reload 2012-02-27 04:59:33 -06:00
aPunch
55ec6d374e revert 2012-02-27 04:12:07 -06:00
aPunch
acf0fe15b1 added mob type requirement to commands 2012-02-27 02:32:43 -06:00
aPunch
120003b4cd have set size for slimes/magma cubes, override chicken egg-laying 2012-02-26 21:12:14 -06:00
aPunch
8b32f746a4 change to remove command 2012-02-26 10:19:57 -06:00
aPunch
4fc109d9ed added owner command, fixed help menu bug 2012-02-26 03:42:55 -06:00
Ian Macali
670d999bfe Fixed Maven. 2012-02-26 01:20:11 -06:00
aPunch
c6e917d243 attempt to fix more world issues 2012-02-26 00:35:44 -06:00
aPunch
17b695bf9d listen to world unloading and loading 2012-02-25 23:23:43 -06:00
aPunch
bb5268f641 added license 2012-02-25 04:20:58 -06:00
aPunch
d6dedc8858 command and permission fixes 2012-02-25 01:57:04 -06:00
aPunch
35dc3ce40a changes to editors 2012-02-25 00:07:53 -06:00
aPunch
edcdcf1aec update to use EntityType instead of CreatureType 2012-02-23 17:45:45 -06:00
aPunch
a1ba5dee89 formatting 2012-02-23 05:17:15 -06:00
fullwall
24b3ad6c9b Update for file moves 2012-02-23 18:22:48 +08:00
fullwall
3a1ad07033 Changes to waypoints 2012-02-23 18:10:38 +08:00
aPunch
4ebdbdd33f command fixes and changes 2012-02-22 20:16:35 -06:00
aPunch
6968b7d927 value flags no longer case-sensitive, remove debug message 2012-02-22 18:37:51 -06:00
aPunch
d5ccfeaae4 format 2012-02-22 17:59:51 -06:00
fullwall
2f6d5d8ec3 Weak references for NavigationCallbacks 2012-02-22 22:05:28 +08:00
aPunch
185b2a05b0 added remove all command 2012-02-21 20:41:09 -06:00
aPunch
b280e918ec added character permission wildcard 2012-02-21 19:59:55 -06:00
aPunch
90d5473ba2 revert permission change 2012-02-21 19:56:22 -06:00
aPunch
67c8d61715 save location after teleport 2012-02-20 15:42:59 -06:00
aPunch
bdc81f1b95 format 2012-02-19 23:09:01 -06:00
aPunch
1a25986d27 added selection event 2012-02-19 23:05:49 -06:00
aPunch
0448528a2e 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
1fcdbac419 capacity cannot be so small 2012-02-19 18:40:25 -06:00
aPunch
d7b0e2e8b5 fix permission 2012-02-19 17:29:27 -06:00
aPunch
12a0c3b32a fix command NPE 2012-02-19 14:21:35 -06:00
aPunch
c89724b391 fix teleporting NPE 2012-02-19 14:05:12 -06:00
aPunch
310e81b338 change to chunk loading/unloading 2012-02-19 11:45:43 -06:00
aPunch
588cfff8cb admins can override ownership 2012-02-19 11:07:19 -06:00
aPunch
5b6e73f10d remove tests temporarily 2012-02-19 10:08:41 -06:00
aPunch
a7fa8b950d added ability for NPCs to chat to one player only 2012-02-18 16:29:29 -06:00
aPunch
8340fa9c76 fix NPE 2012-02-18 12:47:57 -06:00
aPunch
5d9f637ee0 change to selection, add /npc remove command for permanent removal 2012-02-17 22:53:28 -06:00
aPunch
369e2c798e fix commands 2012-02-17 21:25:17 -06:00
aPunch
6e6c9eb167 added /npc 2012-02-17 18:37:33 -06:00
aPunch
8b21ec5b3f added more messaging flags 2012-02-17 11:48:33 -06:00
fullwall
64559a9579 Fix pom.xml 2012-02-17 15:48:20 +08:00
aPunch
db8d5cb02b work now 2012-02-16 17:56:25 -06:00
aPunch
f1f0bcddea work now 2012-02-16 17:48:07 -06:00
aPunch
e2807d9baf work now 2012-02-16 17:40:20 -06:00
aPunch
dd1076d048 test jenkins 2012-02-16 17:33:01 -06:00
aPunch
88822dca0f added temporary selection API until Bukkit adds metadata 2012-02-14 05:45:50 -06:00
fullwall
cfb7bfe1e0 Revert "Changes to inventories" 
This reverts commit ffe0fecc9b.
 2012-02-14 19:38:44 +08:00
fullwall
ffe0fecc9b Changes to inventories 2012-02-14 18:52:22 +08:00
aPunch
659b1c7dde player tag for messages 2012-02-13 07:08:36 -06:00
fullwall
1693202784 Implement minecraft-like AI system 2012-02-13 19:48:38 +08:00
aPunch
f77e1e71ec customizable chat prefix 2012-02-12 12:29:33 -06:00
aPunch
b35d5f05cd fix 2012-02-12 09:54:25 -06:00
aPunch
6481ea948d fix metrics bug 2012-02-12 04:02:36 -06:00
aPunch
7af4fd113e fix import errors 2012-02-12 02:00:19 -06:00
fullwall
38ae2936af Delete files 2012-02-12 15:20:08 +08:00
fullwall
c609030ff7 Metrics 2012-02-12 15:19:32 +08:00
fullwall
6529364397 Merge branch 'master' of http://www.github.com/aPunch/Citizens2 2012-02-12 11:00:23 +08:00
fullwall
c0a272f431 Remove CommandIdentifier 2012-02-12 10:59:45 +08:00
aPunch
0bbf996e22 move storage to API for convenience 2012-02-11 10:33:36 -06:00
aPunch
39dd529e9c removed Inventory from Citizens, added to API 2012-02-11 08:33:19 -06:00
aPunch
3a9496fc71 change 2012-02-11 05:04:19 -06:00
aPunch
0de701800c not working 2012-02-11 03:21:02 -06:00
aPunch
057e28d600 command fix 2012-02-11 01:11:45 -06:00
aPunch
c2f42c6837 added character setting command 2012-02-09 16:30:57 -06:00
aPunch
18125d682b shorten names when renaming NPC 2012-02-08 14:01:27 -06:00
aPunch
649eef5b30 Merge branch 'master' of github.com:aPunch/Citizens2 2012-02-08 09:35:18 -06:00
aPunch
e72465179b really fix it this time 2012-02-08 09:32:38 -06:00
fullwall
941ed6158a Merge branch 'master' of http://www.github.com/aPunch/Citizens2 2012-02-08 23:25:39 +08:00
aPunch
158519efd6 added some commands, fixed bug where NPCs that despawned via chunk loading were deselected 2012-02-08 09:22:42 -06:00
fullwall
db8d534bd1 Remove nested commands 2012-02-08 23:15:36 +08:00
aPunch
7566a15966 added file headers 2012-02-08 06:07:17 -06:00
aPunch
efaa462894 dynamic help menus 2012-02-08 02:26:14 -06:00
aPunch
ba8ee44769 use permission() in Command annotation 2012-02-07 05:31:22 -06:00
aPunch
455e49b4eb moved NPC rotation to LookClose trait, fix name color saving 2012-02-07 04:37:12 -06:00
fullwall
3c1f9fd8c0 Runnables 2012-02-07 17:45:43 +08:00
aPunch
2a51adcaab inventories now use the full name of an NPC 2012-02-07 02:31:28 -06:00
aPunch
89bd263aad whoops 2012-02-06 05:58:22 -06:00
aPunch
68cc28eb05 proper color-parsing for names 2012-02-06 05:55:29 -06:00
fullwall
0e3f29c6f8 Fixed up new command features + test 2012-02-06 16:30:45 +08:00
aPunch
6c47757453 mob type is optional for create command 2012-02-05 07:02:47 -06:00
aPunch
4067a85bce fixed bug 2012-02-05 05:31:08 -06:00
aPunch
1f5dd50d3f items now save in the correct slot, enchantments are saved on inventory close 2012-02-05 05:26:55 -06:00
aPunch
97b6a74c68 disallow names greater than 16 characters in length as per vanilla spec 2012-02-05 04:24:11 -06:00
aPunch
8a63d0950e saving inventories kind of works now 2012-02-05 04:08:24 -06:00
aPunch
11fbd0c7b4 inventory work 2012-02-05 03:10:09 -06:00
fullwall
28273ec7b5 ShowableInventory 2012-02-05 15:26:49 +08:00
aPunch
7a4fff1e68 added inventory-related API 2012-02-05 01:18:40 -06:00
aPunch
b557837ecb remove debug messages 2012-02-04 17:00:40 -06:00
aPunch
6aca4590a3 getTrait is safer 2012-02-04 16:58:40 -06:00
aPunch
76a769489c removed duplicate files 2012-02-04 16:14:48 -06:00
fullwall
b8bb1955d9 Command features 2012-02-04 23:26:06 +08:00
fullwall
ddb1a88bd0 Revert to old socket, fix NPE 2012-02-04 22:49:16 +08:00
fullwall
f2e9a7dc3f Override dragon + endermen AI 2012-02-04 22:31:16 +08:00
fullwall
3d8e1f4988 Merge AIController and Navigator 2012-02-04 17:58:51 +08:00
aPunch
ab0a8dcae3 changes and bugfixes 2012-02-04 02:13:20 -06:00
fullwall
739d7490fd Change mob classes to static inner, add rudimentary pathfinder 2012-02-04 14:48:23 +08:00
aPunch
9bb9abf700 registering traits no longer requires a String parameter 2012-02-03 17:44:18 -06:00
aPunch
d30d892982 attempt some better trait exception handling 2012-02-03 17:35:24 -06:00
aPunch
2f69deec93 remove file 2012-02-03 03:21:16 -06:00
aPunch
9029ea29ec initial mob type NPCs implementation 2012-02-03 03:20:48 -06:00
aPunch
4c8ccdcba2 method name change 2012-01-30 17:44:12 -06:00
aPunch
c2de3bfcfa bug fixes 2012-01-30 12:55:16 -06:00
fullwall
27e2a6c8c9 Cleanup 2012-01-30 19:58:59 +08:00
aPunch
a0f7d8c130 added incompatibility error prevention 2012-01-29 14:58:19 -06:00
aPunch
49d8034bd2 updated to Bukkit 1.1-R2 2012-01-29 13:29:23 -06:00
aPunch
d4977e10d2 make sure mc entity is null when despawning 2012-01-29 13:14:10 -06:00
aPunch
0e737cc367 added spawned trait 2012-01-29 12:23:42 -06:00
aPunch
967eef4836 added selection command, bug fixes 2012-01-29 11:52:50 -06:00
fullwall
ed6a05e7c4 Changes 2012-01-29 19:43:27 +08:00
aPunch
dcbabe9ee1 added some teleporting commands 2012-01-28 23:01:08 -06:00
aPunch
b85a378a7d fix? 2012-01-28 17:19:45 -06:00
aPunch
922cf2444b more bugfixes 2012-01-28 16:40:00 -06:00
aPunch
6837ac11ea bug fixes 2012-01-28 14:16:30 -06:00
fullwall
55c1dc7be0 Changes 2012-01-28 12:11:23 +08:00
aPunch
2bd13d1eb0 added command requirements and NPC owners 2012-01-26 15:08:32 -06:00
aPunch
86b84c259a fixes and changes 2012-01-26 08:45:42 -06:00
aPunch
d5a127fb1d fix reload bug 2012-01-25 17:09:02 -06:00
aPunch
8c4aa23461 changes to commands 2012-01-25 14:40:01 -06:00
aPunch
4e7b2efc4f some more commands 2012-01-25 14:07:49 -06:00
aPunch
d23dd7c747 initial command commit, needs lots of work 2012-01-25 09:29:54 -06:00
aPunch
2c844d492d remove debug test 2012-01-25 04:33:45 -06:00
aPunch
575c3a5b99 added ability to send chat through an NPC 2012-01-25 04:32:24 -06:00
aPunch
848cbce13a changes and fixes to character handling 2012-01-25 04:09:02 -06:00
aPunch
21bfe51c83 fix outofmemory error 2012-01-24 01:49:56 -06:00
aPunch
fbf4741ada properly remove NPC 2012-01-23 10:05:22 -06:00
aPunch
e5ee5d6dd1 fix ID bug and others 2012-01-23 09:42:01 -06:00
aPunch
47e77f2a45 added selection, needs work 2012-01-23 08:30:15 -06:00
fullwall
0106c8a675 AbstractNPC 2012-01-23 17:46:06 +08:00
fullwall
b742c232b8 Cleanup, add() method in ByIdArray 2012-01-23 16:45:34 +08:00
fullwall
6c6627362f Forgot to put this back 2012-01-23 14:25:23 +08:00
fullwall
9bc4b54db5 Merge CharacterManager and TraitManager 2012-01-23 14:12:45 +08:00
aPunch
ffa6888420 fix annoying spawning save bug 2012-01-22 11:43:58 -06:00
aPunch
d95501bd1c build "fixed" and other saving fix 2012-01-22 08:43:25 -06:00
aPunch
1beaae6b30 more stubborn formatting 2012-01-22 08:23:25 -06:00
fullwall
7cb59f9f8a Merge 2012-01-22 22:09:32 +08:00
fullwall
59ba77f775 Add test, fix bug 2012-01-22 22:07:35 +08:00
aPunch
6bd85f50c0 possible fix and lots of other changes 2012-01-22 07:48:50 -06:00
fullwall
d0e964153d Merge branch 'master' of http://www.github.com/aPunch/Citizens2 2012-01-22 16:04:27 +08:00
fullwall
1347dce509 Change to ByIdArray 2012-01-22 16:04:10 +08:00
aPunch
596fa0e74b more formatting again 2012-01-22 02:02:49 -06:00
aPunch
4341327c3c more formatting 2012-01-22 01:58:02 -06:00
aPunch
2a99446bd5 formatting fun 2012-01-22 01:52:46 -06:00
fullwall
8ffc62a9a0 Allow easier trait registration 2012-01-22 15:31:49 +08:00
fullwall
aa6c20dcd5 Changes to trait api 2012-01-22 15:10:25 +08:00
aPunch
f583344506 update for SpawnLocation trait 2012-01-21 10:21:21 -06:00
aPunch
7e7e4ff37a small change 2012-01-21 08:44:21 -06:00
aPunch
3239eb3cc0 remove test setting 2012-01-21 07:57:57 -06:00
aPunch
8c797f7a78 implemented settings 2012-01-21 07:56:50 -06:00
aPunch
8ab0c815d9 fix saving bugs 2012-01-21 06:53:58 -06:00
aPunch
0511dd53b8 bugfixes 2012-01-20 09:15:32 -06:00
aPunch
204023728c bugfixes 2012-01-20 07:15:14 -06:00
aPunch
a240b71573 bugfixes 2012-01-20 01:48:55 -06:00
aPunch
504d4f94d2 traits should not load properly 2012-01-20 01:27:14 -06:00
aPunch
150d037137 something 2012-01-19 06:21:04 -06:00
aPunch
d5df854e5a use spaces 2012-01-19 05:43:21 -06:00
aPunch
7fea467676 refactor a bit 2012-01-19 04:52:58 -06:00
aPunch
5aec593858 update to latest Bukkit event API 2012-01-19 01:38:40 -06:00
aPunch
7d10c522ec more saving work 2012-01-18 06:48:47 -06:00
aPunch
eb503dab12 use Entity instead of LivingEntity to avoid needing to cast 2012-01-18 04:47:13 -06:00
aPunch
56053849eb if you say it, do it! 2012-01-18 04:37:09 -06:00
aPunch
b923781a2c added some events 2012-01-18 04:35:15 -06:00
aPunch
4aafac4604 testing new Bukkit events 2012-01-17 22:04:08 -06:00
aPunch
2ef5d5323d switching to maven 2012-01-16 15:18:47 -06:00
aPunch
7b727c3d6b implemented saving framework, messaging utils 2012-01-15 21:15:32 -06:00
aPunch
b10094d441 fix bug 2012-01-15 13:33:49 -06:00
aPunch
d6a907d7e5 format 2012-01-15 01:04:08 -06:00
aPunch
04ab5a36ef implemented more of the /lib/ 2012-01-15 01:00:04 -06:00
aPunch
e1d3cd4f31 go back go back go back, go back to where we were 2012-01-14 23:09:31 -06:00
aPunch
a3dd54757e added names 2012-01-14 22:41:02 -06:00
aPunch
ffd078a3f8 derp 2012-01-14 22:28:25 -06:00
aPunch
ac7f58b089 changes 2012-01-14 22:23:58 -06:00
aPunch
cf1bb89509 forgot something 2012-01-14 21:55:45 -06:00
aPunch
46eb073031 added exceptions 2012-01-14 21:52:31 -06:00
aPunch
456c9bfceb call event elsewhere 2012-01-14 17:58:47 -06:00
aPunch
32abcf8a79 initial Citizens2 commit 2012-01-14 17:51:37 -06:00