Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-04 00:23:26 +01:00
Code Issues Projects Releases Wiki Activity
647 Commits 6 Branches 0 Tags 106 MiB
0d6b4e021e
Commit Graph

426 Commits

Author SHA1 Message Date
fullwall
fa35bed33f Implement NPCCollisionEvent, made EntityType matching more sane 2012-07-28 00:01:52 +08:00
fullwall
f27eab8622 Add isPaused() and setPaused(boolean) to WaypointProvider 2012-07-27 22:48:06 +08:00
fullwall
af9c42cfb6 Fix waypoints (an issue with the Goal, not pathing) and make entity type use the bukkit naming scheme 2012-07-26 19:01:50 +08:00
fullwall
90191c435e Add isPushable() and setPushable(), cleanup 2012-07-24 14:47:10 +08:00
fullwall
1bd973141a Fix equipment editing 2012-07-24 14:21:59 +08:00
fullwall
f9574a2551 Fix pig pathing speed 2012-07-22 15:44:40 +08:00
fullwall
20c102f1e7 Add -r flag to /npc trat 2012-07-22 14:47:44 +08:00
fullwall
b73afa92d6 Better threading - stop memory leak 2012-07-22 14:18:24 +08:00
fullwall
94e366ff31 Remove debugging, don't use metrics for internal traits 2012-07-21 23:28:19 +08:00
fullwall
5748a3007c Fix some bugs 2012-07-21 23:19:54 +08:00
fullwall
d6e5995df9 Don't use internal classes from other packages. Fixes CITIZENS-112 2012-07-21 14:11:32 +08:00
fullwall
bcd727e554 Git fail. WARNING: API BREAKAGES 2012-07-19 23:10:30 +08:00
fullwall
151d82a83f Revert "Simplification part 1 - remove characters" 
This reverts commit 10ae38882d.
 2012-07-09 21:35:57 +08:00
fullwall
d207234df5 Revert "Add files" 
This reverts commit 1a13150572.
 2012-07-09 21:35:45 +08:00
fullwall
1a13150572 Add files 2012-07-09 16:51:38 +08:00
fullwall
10ae38882d Simplification part 1 - remove characters 2012-07-09 16:46:53 +08:00
fullwall
91f6472932 Hackfix a stack overflow problem. 2012-06-11 16:11:54 +08:00
fullwall
5c72a2ed01 Update master 2012-06-10 16:09:53 +08:00
fullwall
97b61473c4 Update master 2012-06-10 16:09:01 +08:00
fullwall
b0ffe41c5a Update master 2012-06-10 16:08:16 +08:00
fullwall
a1dabf0b36 Update master 2012-06-10 16:06:45 +08:00
fullwall
200e4f4ed1 Update master 2012-06-10 16:05:42 +08:00
fullwall
8f9ecea073 Update master 2012-06-10 16:04:34 +08:00
fullwall
d826bb3b69 Normalise editing slot. 2012-05-30 16:39:35 +08:00
fullwall
4144953dff This is why you don't use the github web interface 2012-05-27 16:48:58 +08:00
fullwall
735afe277c Update src/main/java/net/citizensnpcs/Settings.java 2012-05-27 16:35:04 +08:00
fullwall
392f28ff25 . 2012-05-27 16:32:11 +08:00
fullwall
70dfe575ff . 2012-05-27 16:31:08 +08:00
fullwall
8aa4c75281 Fix an issue in Settings. 2012-05-27 16:30:27 +08:00
DMarby
50b762bb8e Corrected Metrics Plotter. 2012-05-26 23:26:46 +03:00
fullwall
e1bca417d8 Metrics.... 2012-05-26 22:31:01 +08:00
fullwall
e3fb3704b5 Fix a multiworld issue in LookClose 2012-05-25 23:02:20 +08:00
fullwall
6cd9401a41 Delete metrics, clean up 2012-05-23 18:57:01 +08:00
fullwall
472ac50003 Fix an issue with setDestination not working immediately after spawn 2012-05-23 16:51:33 +08:00
fullwall
783dd9a5a9 Just use instanceofs 2012-05-18 00:06:31 +08:00
fullwall
ad31ba7221 Tempfix all the things 2012-05-17 23:55:25 +08:00
fullwall
6db2fa9ca6 Don't add pig traits at spawn. 2012-05-17 23:49:09 +08:00
fullwall
4a51cba1a2 Temporary hack to fix age throwing errors, don't give every NPC age on create 2012-05-17 23:31:09 +08:00
fullwall
26277ecab6 Remove explicit @ServerCommand, remove unnecessary instanceof in CitizensNPCRegistry 2012-05-17 23:14:30 +08:00
fullwall
fba0777a0d BREAKING: rename methods 2012-05-17 21:34:03 +08:00
fullwall
bcc36a3076 Fix typo 2012-05-14 19:45:16 +08:00
fullwall
5ea3f32f76 Remove constructor parameter, add method in Util 2012-05-13 19:41:21 +08:00
fullwall
31dc1f813b Use new constructor 2012-05-12 15:18:04 +08:00
fullwall
e6d76e696c Fix bugs with controllables, waypoints, add waypoint editing slot, call damage event 2012-05-12 15:13:58 +08:00
fullwall
8a07f129b9 Fixed an issue with waypoints 2012-05-12 10:01:27 +08:00
fullwall
09776024e0 Bugfixes, console can select NPCs for use with commands 2012-05-11 23:13:10 +08:00
fullwall
e491d1bb07 Changes to arm animations, noDamageTicks is decremented again 2012-05-10 20:51:11 +08:00
fullwall
4bc1426192 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-05-08 21:38:52 +08:00
fullwall
7a8a5cb210 Changes 2012-05-08 21:38:28 +08:00
David Marby
b1824f33e1 Now shows amount of NPCs instead of amount of servers 2012-05-07 21:44:54 +02:00
David Marby
9d6a53cbc2 Capitalize names 2012-05-07 19:53:58 +02:00
David Marby
b38f1bac8e Made it actually work, lawl 2012-05-07 19:33:02 +02:00
David Marby
e8b4443df7 Another Cleanup 2012-05-06 17:58:56 +02:00
David Marby
ee3d052bd1 Cleanup 2012-05-05 21:24:50 +02:00
David Marby
bc5d922718 Updated Metrics, Added Character Types Metrics 2012-05-05 17:22:11 +02:00
fullwall
172c46f766 Fix logic error in entity equip 2012-05-04 18:41:47 +08:00
aPunch
a9105c624e Slightly hackish workaround for mob NPC and spawn egg bug. This fixes CITIZENS-59. 2012-05-03 16:38:23 -05:00
aPunch
affb84f6cd Fix equip NPE. This fixes CITIZENS-62. 2012-05-03 15:53:35 -05:00
fullwall
81d6c2a3a3 Changes 2012-05-03 23:22:31 +08:00
fullwall
bed9c12c57 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
c7eb4eb1b0 Fixed human npcs not updating properly, exclude some types from waypoints 2012-04-30 22:56:27 +08:00
fullwall
f610651dbc Refactoring, Behaviour trait (scripted AI) 2012-04-30 21:38:18 +08:00
fullwall
8960722ad7 Fix typo 2012-04-30 19:56:57 +08:00
fullwall
9fa9e73f21 Fix bugs 2012-04-30 17:52:55 +08:00
fullwall
78d77ee04b Cache workaround no longer applicable 2012-04-29 17:03:10 +08:00
aPunch
4b7e6dd189 No need for an extra key 2012-04-26 04:01:12 -05:00
fullwall
6ee305d192 Package refactor, getNPC lookup optimisation, fix ByIdArray iterator remove 2012-04-24 23:05:38 +08:00
fullwall
391b35d0f7 Minor changes 2012-04-24 14:17:16 +08:00
fullwall
f358dfc548 Fix typo 2012-04-24 14:13:05 +08:00
fullwall
8c28909411 Extra validation code in Itr 2012-04-24 14:01:52 +08:00
fullwall
a975b9ebf5 Ignore non-living entities 2012-04-24 13:31:52 +08:00
fullwall
f405d4cb7d Avoid using iterators where possible 2012-04-22 19:33:35 +08:00
fullwall
69b71fcf76 Remove hyphens from trait names, add TODO 2012-04-22 17:57:50 +08:00
fullwall
f7e85f08ab Rework lookclose logic, Controllable is now Toggleable 2012-04-21 14:12:30 +08:00
fullwall
4dd0cb03a3 Default type to player if not found 2012-04-20 23:19:15 +08:00
fullwall
6d5b73a2dd Fix errors in entity instantiation and update entities properly 2012-04-20 22:45:09 +08:00
fullwall
27a7b9680e 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
325a23e5f5 Fix for controllables not creating the trait properly 2012-04-20 21:49:30 +08:00
fullwall
05a7ee468b Simple controllable command 2012-04-19 22:57:54 +08:00
fullwall
7a53a0c163 Move updating to individual entities 2012-04-19 11:52:07 +08:00
fullwall
d65346482e Minor cleanup 2012-04-18 10:12:17 +08:00
fullwall
62551967e5 Use PluginProvider 2012-04-16 22:58:09 +08:00
aPunch
9c2a748d27 Change 2012-04-15 18:35:25 -05:00
fullwall
3a25ca5ce8 Change classpath method to Thread.setContextClassLoader() 2012-04-15 22:39:17 +08:00
fullwall
48c073dffe Exclude current classloader 2012-04-15 21:35:46 +08:00
aPunch
7aa5e4bd74 Change error message 2012-04-14 18:37:13 -05:00
aPunch
4e245cff4f Attempt to fix configuration loading 2012-04-14 18:32:43 -05:00
aPunch
7687b80ffc Add missing permissions to plugin.yml 2012-04-14 18:17:22 -05:00
aPunch
2cab36d2e0 Changes 2012-04-14 11:49:18 -05:00
fullwall
4e5ecff66a Use new ScriptCompiler method 2012-04-15 00:29:13 +08:00
fullwall
44b904ed0a Move commands around 2012-04-13 23:59:51 +08:00
aPunch
19aba97351 Changes 2012-04-12 12:19:45 -05:00
fullwall
9f31132bdf Derp 2012-04-12 23:31:54 +08:00
fullwall
2695cba3ec Add script compile command 2012-04-12 23:30:01 +08:00
fullwall
c4f8b92ed8 Hook into new event ContextProvider 2012-04-12 23:01:56 +08:00
aPunch
462f90270b Change to text prompt 2012-04-07 18:00:31 -05:00
aPunch
8547e2e830 Small change 2012-04-05 10:03:30 -05:00
fullwall
d8446c12ed Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-04-01 19:15:06 +08:00
fullwall
76a65c890b Minor changes 2012-04-01 19:14:11 +08:00
aPunch
2a478a2961 Updated to 1.2.5 2012-03-31 16:15:53 -05:00
fullwall
323f99c2e0 Storage type is now a setting 2012-03-30 22:01:36 +08:00
fullwall
f053870423 Move callback order 2012-03-27 23:26:47 +08:00
fullwall
325dacf713 Minor optimisations and changes 2012-03-27 22:42:15 +08:00
fullwall
4a45b3eedf Minor change to item finder 2012-03-25 16:43:24 +08:00
fullwall
942e7ae9ed NPE check 2012-03-25 16:28:47 +08:00
fullwall
de821df98d Bugfix 2012-03-25 16:19:08 +08:00
aPunch
b27954548e Ugh 2012-03-23 07:06:04 -05:00
aPunch
eb2592300d Remove debug message 2012-03-23 07:05:01 -05:00
aPunch
7cab8a69a2 Fix NoSuchElementException on remove all 2012-03-23 07:01:55 -05:00
aPunch
24a66088fd Fixes 2012-03-23 06:55:53 -05:00
aPunch
30132872a9 Modifications to Traits 2012-03-23 06:18:10 -05:00
aPunch
09303b9ead Update to 1.2.4 2012-03-22 18:49:15 -05:00
aPunch
e0e9fe03c5 Small cleanup 2012-03-22 04:37:36 -05:00
aPunch
a144f1cee4 Use Ageable instead of Animals 2012-03-22 00:19:54 -05:00
aPunch
8c8b3ac122 Changes 2012-03-21 05:45:05 -05:00
fullwall
eae9ae6f46 Minor cleanup 2012-03-21 17:40:40 +08:00
aPunch
c271ffb14e Format 2012-03-20 19:29:13 -05:00
aPunch
7b55fda4fa Added ability to set the server as the owner of an NPC. 2012-03-20 14:38:37 -05:00
aPunch
09f977f194 Added ability to equip Pig NPCs with saddles. This addresses CITIZENS-6. 2012-03-18 18:11:13 -05:00
aPunch
2e9f7db721 Added ability to modify NPC age. This addresses CITIZENS-10. 2012-03-18 16:14:17 -05:00
aPunch
9474532efb Add ability to edit sheep via the equipment editor. This address CITIZENS-5. 2012-03-17 10:43:43 -05:00
fullwall
126cfc8489 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-03-15 19:38:48 +08:00
fullwall
46ad744582 Fix for CITIZENS-31 2012-03-15 19:38:10 +08:00
aPunch
80838fcd4b Added ability to change a villager NPC profession. This addresses CITIZENS-14. 2012-03-15 06:02:53 -05:00
fullwall
2468a8c0eb Fix CITIZENS-21, partially fix CITIZENS-2 and CITIZENS-11 2012-03-15 18:06:40 +08:00
aPunch
20382e370b Change 2012-03-15 03:33:00 -05:00
aPunch
86c8cb3934 Added default text in config file. This addresses CITIZENS-28. 2012-03-15 03:30:40 -05:00
aPunch
99280ccaf0 Forgot to remove something 2012-03-14 16:50:48 -05:00
aPunch
ace140882b Fix saving and loading from files. This fixes CITIZENS-30. 2012-03-14 16:48:02 -05:00
aPunch
ac7644234a Fix saving and loading bugs. 2012-03-14 02:05:15 -05:00
aPunch
b1c29e1e14 Added support for * wildcard for selection and talking. This addresses CITIZENS-26. 2012-03-14 01:09:20 -05:00
aPunch
2c3a51c3f7 Fix look-close and talk-close defaults. This fixes CITIZENS-27. 2012-03-14 00:16:42 -05:00
aPunch
e03151f60f Change 2012-03-12 14:13:20 -05:00
aPunch
98032f8b4a Call super remove(), fix trait loading bug 2012-03-12 13:50:48 -05:00
fullwall
17f6c4fc70 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
88019f2ac9 Fix part of CITIZENS-11 (waypoint saving incorrectly) 2012-03-12 18:17:28 +08:00
aPunch
9ca35da988 Fixed characters having no valid mob types by default. 2012-03-12 01:44:16 -05:00
aPunch
dc04b0f9e1 Fix pitch and yaw not saving properly. This fixes CITIZENS-22. 2012-03-12 01:26:08 -05:00
aPunch
dcf81236df Fixed NoSuchElementException on disable. 2012-03-11 18:33:58 -05:00
aPunch
15c1ad24ad Added support for using help menu in console. This addresses CITIZENS-20. 2012-03-11 18:26:40 -05:00
aPunch
0cbf0d8d74 Added ability to change if a creeper NPC is powered. This address CITIZENS-16. 2012-03-11 17:39:18 -05:00
aPunch
bd6f2ec49a Fixed grammar issues in help menu. This fixes CITIZENS-19. 2012-03-11 16:57:32 -05:00
aPunch
93315b4b40 Prevent creeper NPCs from becoming powered by lightning. This partially fixes CITIZENS-16. 2012-03-11 16:52:21 -05:00
aPunch
f725893005 Prevent lightning from morphing pigs into pig zombies. This fixes CITIZENS-17. 2012-03-11 16:46:24 -05:00
aPunch
d9a7175407 Fix reload removing NPCs. This fixes CITIZENS-13. 2012-03-11 15:14:36 -05:00
aPunch
1293c1f7fb Added onNPCSpawn method to Trait. 2012-03-11 03:53:19 -05:00
aPunch
458efb9152 Added left and right click events. 2012-03-11 00:43:18 -06:00
aPunch
d4113c1984 Added ability to equip the carried material for Enderman. This addresses CITIZENS-7. 2012-03-10 19:11:28 -06:00
aPunch
0c70b28803 removed some methods from API 2012-03-10 13:41:09 -06:00
fullwall
95cddba16b Changes 2012-03-10 18:33:11 +08:00
fullwall
836e1cf6a4 Pathfinding changes 2012-03-10 13:59:37 +08:00
aPunch
d2cc9982ec update to latest API changes 2012-03-09 14:53:02 -06:00
aPunch
b0947cb743 fix text editing 2012-03-08 17:57:24 -06:00
aPunch
35ce20c6b3 Implement Character entitytype forcing 2012-03-08 15:27:36 -06:00
aPunch
62808e386b changes 2012-03-08 12:01:12 -06:00
aPunch
c45c7d919d major character and trait refactor 2012-03-07 19:03:32 -06:00
aPunch
15d0087064 small changes 2012-03-05 18:32:53 -06:00
aPunch
adfe76c65e change to talking 2012-03-04 12:06:33 -06:00
aPunch
de6d1b7e18 changes to text editing, added click to talk and some talk settings 2012-03-03 08:15:45 -06:00
aPunch
b6b00f8fef added talk-close command and config settings 2012-03-02 18:04:49 -06:00
aPunch
ac897a471a changes to text 2012-03-02 16:42:58 -06:00
aPunch
44a98bb60f compatible with 1.2.3 2012-03-02 15:44:59 -06:00
aPunch
8f0af02292 initial text editing using Conversations API 2012-03-02 14:42:34 -06:00
aPunch
de7ab2b109 fix remove all bug 2012-03-02 09:58:09 -06:00
aPunch
f61c02924e fix remove all command 2012-03-02 08:32:03 -06:00
fullwall
d3128ee874 Misc changes / javadoc 2012-03-02 21:04:40 +08:00
fullwall
23ab7664a2 Attempted fixes 2012-03-02 19:39:47 +08:00
fullwall
5b8a02d39c Fix? 2012-03-02 19:20:38 +08:00
fullwall
742a1a3a4e Merge selection fix 2012-03-02 19:10:46 +08:00
fullwall
bd3640b1a0 Don't keep chunk references around 2012-03-02 18:59:40 +08:00
fullwall
eac617e682 Merge 2012-03-02 18:38:39 +08:00
fullwall
a77f180b5b Changes to waypoints 2012-03-02 18:36:54 +08:00
aPunch
1e8237a097 fix selection issue 2012-03-02 04:19:18 -06:00
aPunch
c57ca76b4f update to new mob AI 2012-03-02 03:59:02 -06:00
aPunch
b82cc9e8d5 completely implement iron golem and ocelot NPCs 2012-03-01 12:22:39 -06:00
aPunch
71153a40ea add new entities, wont work until Bukkit adds API for them 2012-03-01 10:13:37 -06:00
fullwall
477d223aca Update to 1.2 2012-03-01 23:12:47 +08:00
aPunch
fcc857d398 change to inventory naming 2012-03-01 06:07:54 -06:00
aPunch
2ce3e60aa0 updated to latest Bukkit and Craftbukkit 2012-03-01 04:45:44 -06:00
aPunch
b9aa42873f added ability to list all NPCs 2012-02-29 07:23:22 -06:00
aPunch
cbb3677db0 added permission to plugin.yml 2012-02-29 07:11:51 -06:00
aPunch
23e3beedf6 added list command 2012-02-29 07:05:25 -06:00
aPunch
5e45c748f7 separate pagination out 2012-02-29 05:39:08 -06:00
aPunch
700a7752ca change to commands 2012-02-29 04:50:45 -06:00
aPunch
416b803216 changes 2012-02-28 09:12:18 -06:00
fullwall
133bf796b5 Remerge 2012-02-28 22:33:38 +08:00
fullwall
bb93032410 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 22:30:26 +08:00
fullwall
4191705cce Change to pathfinding 2012-02-28 22:30:02 +08:00
aPunch
f782850964 equip fix 2012-02-28 08:29:40 -06:00
fullwall
50b98ae39e Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-02-28 22:18:24 +08:00
fullwall
91de970bc0 Fix some bugs 2012-02-28 22:17:49 +08:00
aPunch
ee78e9981e color change 2012-02-28 07:47:44 -06:00
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