Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-24 11:38:26 +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
e3d553e0d7 Hackfix a stack overflow problem. 2012-06-11 16:11:54 +08:00
fullwall
de5edc19ad Update master 2012-06-10 16:09:53 +08:00
fullwall
8198e82aaf Update master 2012-06-10 16:09:01 +08:00
fullwall
5247967cbb Update master 2012-06-10 16:08:16 +08:00
fullwall
dfdce9e4b6 Update master 2012-06-10 16:06:45 +08:00
fullwall
e28e06ea2a Update master 2012-06-10 16:05:42 +08:00
fullwall
5912709b7d Update master 2012-06-10 16:04:34 +08:00
fullwall
5c7ac6926b Normalise editing slot. 2012-05-30 16:39:35 +08:00
fullwall
c0baa1b446 This is why you don't use the github web interface 2012-05-27 16:48:58 +08:00
fullwall
36e8d3ca88 Update src/main/java/net/citizensnpcs/Settings.java 2012-05-27 16:35:04 +08:00
fullwall
0302da1513 . 2012-05-27 16:32:11 +08:00
fullwall
10543438bd . 2012-05-27 16:31:08 +08:00
fullwall
06ba12c22e Fix an issue in Settings. 2012-05-27 16:30:27 +08:00
DMarby
1ae9bf3a47 Corrected Metrics Plotter. 2012-05-26 23:26:46 +03:00
fullwall
bbd38fd5c2 Metrics.... 2012-05-26 22:31:01 +08:00
fullwall
32445afec6 Fix a multiworld issue in LookClose 2012-05-25 23:02:20 +08:00
fullwall
c5e95eb667 Delete metrics, clean up 2012-05-23 18:57:01 +08:00
fullwall
22602c225a Fix an issue with setDestination not working immediately after spawn 2012-05-23 16:51:33 +08:00
fullwall
08e5f8223d Just use instanceofs 2012-05-18 00:06:31 +08:00
fullwall
841f378750 Tempfix all the things 2012-05-17 23:55:25 +08:00
fullwall
0262ffd018 Don't add pig traits at spawn. 2012-05-17 23:49:09 +08:00
fullwall
4698e70f77 Temporary hack to fix age throwing errors, don't give every NPC age on create 2012-05-17 23:31:09 +08:00
fullwall
434bc6168b Remove explicit @ServerCommand, remove unnecessary instanceof in CitizensNPCRegistry 2012-05-17 23:14:30 +08:00
fullwall
22ced5b02b BREAKING: rename methods 2012-05-17 21:34:03 +08:00
fullwall
41ddb6851b Fix typo 2012-05-14 19:45:16 +08:00
fullwall
4cd729ae20 Remove constructor parameter, add method in Util 2012-05-13 19:41:21 +08:00
fullwall
f3f8fceb6c Use new constructor 2012-05-12 15:18:04 +08:00
fullwall
f8cec0710f Fix bugs with controllables, waypoints, add waypoint editing slot, call damage event 2012-05-12 15:13:58 +08:00
fullwall
99f6f28e24 Fixed an issue with waypoints 2012-05-12 10:01:27 +08:00
fullwall
5bf0e6b0fe Bugfixes, console can select NPCs for use with commands 2012-05-11 23:13:10 +08:00
fullwall
16fb69950a Changes to arm animations, noDamageTicks is decremented again 2012-05-10 20:51:11 +08:00
fullwall
14ae59d090 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-05-08 21:38:52 +08:00
fullwall
406dfea4d1 Changes 2012-05-08 21:38:28 +08:00
David Marby
dc3544263d Now shows amount of NPCs instead of amount of servers 2012-05-07 21:44:54 +02:00
David Marby
f8245cc79e Capitalize names 2012-05-07 19:53:58 +02:00
David Marby
dfe92470e5 Made it actually work, lawl 2012-05-07 19:33:02 +02:00
David Marby
ef24c160ad Another Cleanup 2012-05-06 17:58:56 +02:00
David Marby
fe54f81b84 Cleanup 2012-05-05 21:24:50 +02:00
David Marby
5830ebb426 Updated Metrics, Added Character Types Metrics 2012-05-05 17:22:11 +02:00
fullwall
1eb3041b3b Fix logic error in entity equip 2012-05-04 18:41:47 +08:00
aPunch
6f77e0e6a7 Slightly hackish workaround for mob NPC and spawn egg bug. This fixes CITIZENS-59. 2012-05-03 16:38:23 -05:00
aPunch
b12b9e11ba Fix equip NPE. This fixes CITIZENS-62. 2012-05-03 15:53:35 -05:00
fullwall
37ba042c29 Changes 2012-05-03 23:22:31 +08:00
fullwall
154192ae38 Set the head yaw as well, remove bukkit from pom as it is included in craftbukkit 2012-04-30 23:19:07 +08:00
fullwall
56ea9bbddb Fixed human npcs not updating properly, exclude some types from waypoints 2012-04-30 22:56:27 +08:00
fullwall
d17e49ee74 Refactoring, Behaviour trait (scripted AI) 2012-04-30 21:38:18 +08:00
fullwall
4b1a0bbeae Fix typo 2012-04-30 19:56:57 +08:00
fullwall
34622b0ba3 Fix bugs 2012-04-30 17:52:55 +08:00
fullwall
2688ae902f Cache workaround no longer applicable 2012-04-29 17:03:10 +08:00
aPunch
8c0ebdc65d No need for an extra key 2012-04-26 04:01:12 -05:00
fullwall
05bd12ba05 Package refactor, getNPC lookup optimisation, fix ByIdArray iterator remove 2012-04-24 23:05:38 +08:00
fullwall
5e373a1b7e Minor changes 2012-04-24 14:17:16 +08:00
fullwall
18bd700f75 Fix typo 2012-04-24 14:13:05 +08:00
fullwall
118223f884 Extra validation code in Itr 2012-04-24 14:01:52 +08:00
fullwall
c8415740dc Ignore non-living entities 2012-04-24 13:31:52 +08:00
fullwall
433c438398 Avoid using iterators where possible 2012-04-22 19:33:35 +08:00
fullwall
bd563d646b Remove hyphens from trait names, add TODO 2012-04-22 17:57:50 +08:00
fullwall
e6c20235c6 Rework lookclose logic, Controllable is now Toggleable 2012-04-21 14:12:30 +08:00
fullwall
32b9f4ff2b Default type to player if not found 2012-04-20 23:19:15 +08:00
fullwall
e60e889775 Fix errors in entity instantiation and update entities properly 2012-04-20 22:45:09 +08:00
fullwall
82da2c8beb Add some more TODOs, make TraitManager slightly more flexible with constructors, fix number of args for controllable 2012-04-20 22:19:03 +08:00
fullwall
8225f3e57b Fix for controllables not creating the trait properly 2012-04-20 21:49:30 +08:00
fullwall
8cf64ddc73 Simple controllable command 2012-04-19 22:57:54 +08:00
fullwall
86dcef9ad0 Move updating to individual entities 2012-04-19 11:52:07 +08:00
fullwall
1048787305 Minor cleanup 2012-04-18 10:12:17 +08:00
fullwall
f993b128f7 Use PluginProvider 2012-04-16 22:58:09 +08:00
aPunch
98631825a3 Change 2012-04-15 18:35:25 -05:00
fullwall
9eea988e48 Change classpath method to Thread.setContextClassLoader() 2012-04-15 22:39:17 +08:00
fullwall
1fd631de49 Exclude current classloader 2012-04-15 21:35:46 +08:00
aPunch
ead03ae510 Change error message 2012-04-14 18:37:13 -05:00
aPunch
c4c46a80d7 Attempt to fix configuration loading 2012-04-14 18:32:43 -05:00
aPunch
e9994ba445 Add missing permissions to plugin.yml 2012-04-14 18:17:22 -05:00
aPunch
a1de216c1a Changes 2012-04-14 11:49:18 -05:00
fullwall
258130c7a0 Use new ScriptCompiler method 2012-04-15 00:29:13 +08:00
fullwall
f36097c6c7 Move commands around 2012-04-13 23:59:51 +08:00
aPunch
5f953764c4 Changes 2012-04-12 12:19:45 -05:00
fullwall
811ccc3e84 Derp 2012-04-12 23:31:54 +08:00
fullwall
29e268b699 Add script compile command 2012-04-12 23:30:01 +08:00
fullwall
9ab17fdf13 Hook into new event ContextProvider 2012-04-12 23:01:56 +08:00
aPunch
bf9936c472 Change to text prompt 2012-04-07 18:00:31 -05:00
aPunch
e653228966 Small change 2012-04-05 10:03:30 -05:00
fullwall
87833c5ce5 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-04-01 19:15:06 +08:00
fullwall
755a00f901 Minor changes 2012-04-01 19:14:11 +08:00
aPunch
7ca1bc41fa Updated to 1.2.5 2012-03-31 16:15:53 -05:00
fullwall
43341db5bf Storage type is now a setting 2012-03-30 22:01:36 +08:00
fullwall
5b6dc2e607 Move callback order 2012-03-27 23:26:47 +08:00
fullwall
5c0b32e8a3 Minor optimisations and changes 2012-03-27 22:42:15 +08:00
fullwall
fd4b07f7e3 Minor change to item finder 2012-03-25 16:43:24 +08:00
fullwall
1d20cd17d1 NPE check 2012-03-25 16:28:47 +08:00
fullwall
ca9c7056e1 Bugfix 2012-03-25 16:19:08 +08:00
aPunch
fdd41ce1ae Ugh 2012-03-23 07:06:04 -05:00
aPunch
2bc928b144 Remove debug message 2012-03-23 07:05:01 -05:00
aPunch
422313c23a Fix NoSuchElementException on remove all 2012-03-23 07:01:55 -05:00
aPunch
6d95c73f5c Fixes 2012-03-23 06:55:53 -05:00
aPunch
4fb0b03e29 Modifications to Traits 2012-03-23 06:18:10 -05:00
aPunch
079f5de742 Update to 1.2.4 2012-03-22 18:49:15 -05:00
aPunch
cba533f317 Small cleanup 2012-03-22 04:37:36 -05:00
aPunch
98dbdfd784 Use Ageable instead of Animals 2012-03-22 00:19:54 -05:00
aPunch
7521e1765d Changes 2012-03-21 05:45:05 -05:00
fullwall
785f353bae Minor cleanup 2012-03-21 17:40:40 +08:00
aPunch
4b83f8d956 Format 2012-03-20 19:29:13 -05:00
aPunch
cd397765dd Added ability to set the server as the owner of an NPC. 2012-03-20 14:38:37 -05:00
aPunch
d042ff8b3b Added ability to equip Pig NPCs with saddles. This addresses CITIZENS-6. 2012-03-18 18:11:13 -05:00
aPunch
114c83ecdd Added ability to modify NPC age. This addresses CITIZENS-10. 2012-03-18 16:14:17 -05:00
aPunch
8683d6b033 Add ability to edit sheep via the equipment editor. This address CITIZENS-5. 2012-03-17 10:43:43 -05:00
fullwall
8e955deff0 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-03-15 19:38:48 +08:00
fullwall
7b624765bf Fix for CITIZENS-31 2012-03-15 19:38:10 +08:00
aPunch
09a09eeede Added ability to change a villager NPC profession. This addresses CITIZENS-14. 2012-03-15 06:02:53 -05:00
fullwall
2614b07208 Fix CITIZENS-21, partially fix CITIZENS-2 and CITIZENS-11 2012-03-15 18:06:40 +08:00
aPunch
33d5a07f29 Change 2012-03-15 03:33:00 -05:00
aPunch
a37716ebeb Added default text in config file. This addresses CITIZENS-28. 2012-03-15 03:30:40 -05:00
aPunch
bc01012701 Forgot to remove something 2012-03-14 16:50:48 -05:00
aPunch
5e34538bd6 Fix saving and loading from files. This fixes CITIZENS-30. 2012-03-14 16:48:02 -05:00
aPunch
38e1955825 Fix saving and loading bugs. 2012-03-14 02:05:15 -05:00
aPunch
3f9218f568 Added support for * wildcard for selection and talking. This addresses CITIZENS-26. 2012-03-14 01:09:20 -05:00
aPunch
0a52a851c8 Fix look-close and talk-close defaults. This fixes CITIZENS-27. 2012-03-14 00:16:42 -05:00
aPunch
4a17a478bf Change 2012-03-12 14:13:20 -05:00
aPunch
4c022b1a37 Call super remove(), fix trait loading bug 2012-03-12 13:50:48 -05:00
fullwall
d0575e3e22 Make NPC handles accessible from nms Entity (increase speed of NPCManager.getNPC), make Text trait respect despawned state, despawn NPCs on death event 2012-03-12 18:45:36 +08:00
fullwall
15ebeab5a9 Fix part of CITIZENS-11 (waypoint saving incorrectly) 2012-03-12 18:17:28 +08:00
aPunch
60e65e9343 Fixed characters having no valid mob types by default. 2012-03-12 01:44:16 -05:00
aPunch
1082f57938 Fix pitch and yaw not saving properly. This fixes CITIZENS-22. 2012-03-12 01:26:08 -05:00
aPunch
111ea65551 Fixed NoSuchElementException on disable. 2012-03-11 18:33:58 -05:00
aPunch
d1cb52cb0a Added support for using help menu in console. This addresses CITIZENS-20. 2012-03-11 18:26:40 -05:00
aPunch
a02521b5cf Added ability to change if a creeper NPC is powered. This address CITIZENS-16. 2012-03-11 17:39:18 -05:00
aPunch
93eaa8059e Fixed grammar issues in help menu. This fixes CITIZENS-19. 2012-03-11 16:57:32 -05:00
aPunch
02f18c3d46 Prevent creeper NPCs from becoming powered by lightning. This partially fixes CITIZENS-16. 2012-03-11 16:52:21 -05:00
aPunch
3e12221c61 Prevent lightning from morphing pigs into pig zombies. This fixes CITIZENS-17. 2012-03-11 16:46:24 -05:00
aPunch
0e657d81db Fix reload removing NPCs. This fixes CITIZENS-13. 2012-03-11 15:14:36 -05:00
aPunch
2f59dd5f07 Added onNPCSpawn method to Trait. 2012-03-11 03:53:19 -05:00
aPunch
a21860a920 Added left and right click events. 2012-03-11 00:43:18 -06:00
aPunch
610a218769 Added ability to equip the carried material for Enderman. This addresses CITIZENS-7. 2012-03-10 19:11:28 -06:00
aPunch
75d2d31586 removed some methods from API 2012-03-10 13:41:09 -06:00
fullwall
565f4ec8cb Changes 2012-03-10 18:33:11 +08:00
fullwall
492d2cf6cb Pathfinding changes 2012-03-10 13:59:37 +08:00
aPunch
502dbac3e4 update to latest API changes 2012-03-09 14:53:02 -06:00
aPunch
7893d42ab8 fix text editing 2012-03-08 17:57:24 -06:00
aPunch
97dd0f33eb Implement Character entitytype forcing 2012-03-08 15:27:36 -06:00
aPunch
afbcc86030 changes 2012-03-08 12:01:12 -06:00
aPunch
ada0262ce4 major character and trait refactor 2012-03-07 19:03:32 -06:00
aPunch
caf17734de small changes 2012-03-05 18:32:53 -06:00
aPunch
b43ab6d28c change to talking 2012-03-04 12:06:33 -06:00
aPunch
85d2441bbc changes to text editing, added click to talk and some talk settings 2012-03-03 08:15:45 -06:00
aPunch
7e6c537fb1 added talk-close command and config settings 2012-03-02 18:04:49 -06:00
aPunch
a34061aff1 changes to text 2012-03-02 16:42:58 -06:00
aPunch
890b9573e8 compatible with 1.2.3 2012-03-02 15:44:59 -06:00
aPunch
ed180614f1 initial text editing using Conversations API 2012-03-02 14:42:34 -06:00
aPunch
d0b0815a18 fix remove all bug 2012-03-02 09:58:09 -06:00
aPunch
db2847ebab fix remove all command 2012-03-02 08:32:03 -06:00
fullwall
8f6b2e5c1e Misc changes / javadoc 2012-03-02 21:04:40 +08:00
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