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

500 Commits

Author SHA1 Message Date
fullwall
9719873ffe Fix wander waypoint provider, stack overflow bug 2012-09-30 23:13:49 +08:00
fullwall
7d6dc1c40a Translate yet more strings 2012-09-30 22:56:57 +08:00
fullwall
14af55efa5 Implements traits() in requirements 2012-09-30 22:13:19 +08:00
fullwall
4134982674 Add /waypoint provider 2012-09-30 19:36:48 +08:00
fullwall
1494f92689 Update metrics, add WaypointCommands, fix templates (which work, mostly) 2012-09-30 19:03:12 +08:00
fullwall
55bb5adef7 More work on i18n - changed Messages to string constants instead of enums, new strings must be translated into the messages_en.properties file 2012-09-30 17:55:51 +08:00
fullwall
3d5612cbf9 Implement template#apply (templates may or may not work) 2012-09-30 00:08:47 +08:00
fullwall
d00ed620b7 Make a start on templates 2012-09-29 23:54:05 +08:00
fullwall
6228339667 Changes 2012-09-29 23:07:48 +08:00
Jeremy Schroeder
5d2ce8d37f Remove old files 2012-09-28 13:36:14 -04:00
Jeremy Schroeder
808bfd30b4 Change Positions to Poses. Use /npc pose 2012-09-28 13:33:44 -04:00
Jeremy Schroeder
e57c6eacd9 Change Positions to Poses. Use /npc pose 2012-09-28 13:29:35 -04:00
Jeremy Schroeder
36af589c7b Fix small bugs/update to /npc position. Add /npc position --remove [name]. 2012-09-28 12:02:05 -04:00
Jeremy Schroeder
dc5047620d Beef up /npc position. Add --save and --load for storing/recalling positions. Example: /npc positions --save position_1 -a ... continue to use -a for making the NPC assume that position. Using /npc position alone will list positions. Using -a alone will neither save nor load, just assume. 2012-09-28 10:25:00 -04:00
fullwall
96f3c48805 Allow markers to be right clicked to update editing slot 2012-09-28 18:10:17 +08:00
fullwall
1f6e568838 Changes to /npc position 2012-09-28 18:03:17 +08:00
fullwall
c9b29cf39f Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-09-28 17:56:47 +08:00
fullwall
ffaf616b1b Fix some bugs with waypoints, add waypoint markers 2012-09-28 17:56:16 +08:00
Jeremy Schroeder
814142802f Add '/npc position -a' to have the NPC's head assume the position of the Player's head. 2012-09-27 18:03:04 -04:00
Jeremy Schroeder
c6ac327728 Add 2012-09-27 17:59:32 -04:00
fullwall
41ba6b1f64 Fix some navigation bugs (thanks jrbudda) 2012-09-24 16:40:13 +08:00
fullwall
7bd21c3161 Revert "Implement new selector" 
This reverts commit a4aebab7ed.
 2012-09-23 13:07:30 +08:00
fullwall
a4aebab7ed Implement new selector 2012-09-22 16:31:53 +08:00
fullwall
3d4387b119 Change Navigation world when the entity changes world 2012-09-22 16:09:40 +08:00
fullwall
87063e9e60 Fix payment 2012-09-22 13:03:52 +08:00
fullwall
3b7502de82 Enable subplugins earlier 2012-09-20 08:52:44 +08:00
fullwall
ac34ec7946 Fix format specifiers in waypoint editor 2012-09-17 23:06:52 +08:00
fullwall
cd8d30130f Allow npcs to be created unspawned with the -u flag 2012-09-17 21:49:28 +08:00
fullwall
d1aee6d6fa Fix CITIZENS-186 2012-09-17 18:20:15 +08:00
fullwall
0ea22a310c Fix CITIZENS-190, add more translations 2012-09-17 18:16:27 +08:00
fullwall
794d78a264 Fix CITIZENS-191 2012-09-17 17:54:56 +08:00
fullwall
892e9f6f59 Fix jrbuddas reported bugs 2012-09-17 17:18:17 +08:00
fullwall
bff94e8bad More work on translations 2012-09-16 19:20:01 +08:00
fullwall
eb0943ad0d Begin work on translation 2012-09-16 16:47:41 +08:00
fullwall
7610f03bb1 Fix up trait command requirements, add /trait add|remove 2012-09-16 14:35:04 +08:00
fullwall
0fb2be3a77 Implement new trait methods 2012-09-16 12:29:08 +08:00
fullwall
45e44d8d68 Add setting for removing NPCs from player list (testing it out), --trait is applied after spawn 2012-09-16 12:04:14 +08:00
fullwall
b14b4173b9 Changes 2012-09-14 16:20:22 +08:00
fullwall
9d34a6b4f2 Possible fix for spawning bugs... TODO implement better 2012-09-14 15:21:07 +08:00
fullwall
1c2181fafc Changes 2012-09-14 14:53:25 +08:00
fullwall
4f9f16aa55 Update pathfinding range more often 2012-09-13 21:11:17 +08:00
fullwall
8b509f2cb7 Some basic refactoring 2012-09-13 21:02:55 +08:00
fullwall
2971c85e5a Fix for subplugins 2012-09-13 20:39:52 +08:00
fullwall
ac35f7d6ec Workaround for metadata issue 2012-09-12 21:18:47 +08:00
fullwall
014e220bf3 Revert "Removed NPC metadata for checking that an entity is an NPC; Bukkit will not be fixing this per BUKKIT-2501" 
This reverts commit d59f350319.
 2012-09-12 20:32:31 +08:00
fullwall
d59f350319 Removed NPC metadata for checking that an entity is an NPC; Bukkit will not be fixing this per BUKKIT-2501 2012-09-12 17:06:21 +08:00
fullwall
e3fe46cb0c Fix NPE 2012-09-11 15:54:27 +08:00
fullwall
88a46277ca Test fix for pathing 2012-09-10 22:40:25 +08:00
fullwall
2c8ed97c42 Check if navigator is navigating in waypoints 2012-09-10 20:20:01 +08:00
fullwall
3c5eb390a6 Fix to Age, cancel navigation target if npc despawns 2012-09-10 19:16:37 +08:00
fullwall
6f211403c3 Update list without iterator 2012-09-10 17:58:12 +08:00
fullwall
fbcb560755 Remove debug code in /npc 2012-09-10 17:41:44 +08:00
fullwall
2c99c062b6 Add /npc vulnerable command 2012-09-09 21:39:53 +08:00
fullwall
f5021b3cfa Fix some issues with Navigator as reported by jrbudda 2012-09-09 18:47:25 +08:00
fullwall
7168db195f Allow selected NPC redefinition in all cases 2012-09-09 18:02:39 +08:00
fullwall
77a7f05e73 Support alternative format for /npc moveto 2012-09-09 17:59:38 +08:00
fullwall
efcda9304f Typo 2012-09-09 17:52:36 +08:00
fullwall
83ffc4c935 Better usability for commands which require an NPC to be selected 2012-09-09 17:52:00 +08:00
fullwall
9a55734d8d Small change, not sure if it will fix anything 2012-09-09 17:35:26 +08:00
fullwall
15a0319c89 Implement new method 2012-09-09 10:36:50 +08:00
fullwall
168ea380e2 Save immediately on shutdown 2012-09-08 23:30:18 +08:00
fullwall
1cd4ff2926 Filter out commands when the player does not own the NPC 2012-09-07 20:52:33 +08:00
fullwall
319efd3fd5 Fix 2012-09-07 20:28:09 +08:00
fullwall
747ad4d1a6 Fixes, flyable NPCs 2012-09-07 20:12:32 +08:00
fullwall
4bdfa52a37 Uncomment motion handling for human npcs 2012-09-07 18:28:29 +08:00
fullwall
83fcb9214c Update push event handling 2012-09-07 18:25:54 +08:00
fullwall
f1ad62b116 Change StuckAction implementation 2012-09-07 16:38:18 +08:00
fullwall
efe6685aaf Change 2012-09-07 16:15:51 +08:00
fullwall
5dbb0f83d6 2.0.1 2012-09-06 17:35:10 +08:00
fullwall
2beeb64e1b Set compatibility string to 1.3.x 2012-09-05 18:52:12 +08:00
fullwall
86f953e503 Refactor CancelReason event firing, NPCs should teleport if no path can be found 2012-09-04 21:11:45 +08:00
fullwall
47fc78469b Don't overwrite saves file if it failed to load 2012-09-04 19:59:46 +08:00
fullwall
a9ff8f1509 Changes to navigator 2012-09-03 22:12:38 +08:00
fullwall
0067ed1f33 Make local params actually local 2012-09-03 16:04:34 +08:00
fullwall
f94a8e727b Fix stationary ticks 2012-09-03 16:01:45 +08:00
fullwall
8391b793ef Explicitly shutdown the navigator 2012-09-03 15:58:21 +08:00
fullwall
5dd6b6d6b2 Scheduler update may have broken yaw updating on spawn 2012-09-03 15:42:54 +08:00
fullwall
0587b68db4 Allow null in CitizensNPCRegistry#getNPC(Entity) 2012-09-03 15:40:40 +08:00
fullwall
a0f3257f46 Throw IOException 2012-09-02 11:12:29 +08:00
fullwall
53a9620817 Made intent clearer 2012-09-02 10:48:29 +08:00
fullwall
46c9e6ac7b Add easy way to control whether to protect NPCs 2012-09-01 23:28:56 +08:00
fullwall
3415f2c630 Make /npc speed modify the speed as a percentage 2012-09-01 23:17:07 +08:00
fullwall
2e9f82a76c Update plugin.yml permissions 2012-09-01 23:15:03 +08:00
fullwall
3f22c7e01a Fix some bugs, implement new navigation customisation 2012-09-01 23:09:42 +08:00
fullwall
635ed1d840 Bugfixes 2012-09-01 18:05:22 +08:00
fullwall
621cfa527f Better output for /npc copy 2012-09-01 15:10:16 +08:00
fullwall
bc82b642af Fix? 2012-09-01 14:26:54 +08:00
fullwall
17720fbd5b Don't use ignoreCancelled on entitytarget/damage 2012-08-31 22:19:04 +08:00
fullwall
751784010f Implement NPC limits 2012-08-29 21:37:00 +08:00
fullwall
a226a7bff2 Nicer output for --trait 2012-08-28 19:38:11 +08:00
fullwall
d0c01d874d Fix pathfinding range 2012-08-27 23:18:12 +08:00
fullwall
88936787c0 Update for 1.3.2, reuse instances when loading 2012-08-26 21:04:07 +08:00
fullwall
1a9c6ae0a0 Implement changes 2012-08-25 10:40:36 +08:00
fullwall
26538aafb0 Enable player swimming 2012-08-19 12:59:32 +08:00
fullwall
1328df1cf9 Bugfix 2012-08-19 12:51:45 +08:00
fullwall
2af3790fc2 Bugfix 2012-08-18 15:13:33 +08:00
fullwall
aa095e0d1b Bugfix 2012-08-17 22:05:30 +08:00
fullwall
4ac86c4e30 Null checks when searching for Vault 2012-08-17 15:12:54 +08:00
fullwall
7eb1a9077f Remove pointless abstraction in WaypointGoal, made it a bit faster when only one waypoint 2012-08-16 23:15:10 +08:00
fullwall
6cf0cc08c5 Implement NPCDamageByBlockEvent 2012-08-16 00:13:46 +08:00
fullwall
3c1cc9934f Add message for NPCPayListener 2012-08-16 00:08:36 +08:00
fullwall
e441abf839 Vault support 2012-08-16 00:06:13 +08:00
fullwall
270f5536af Check for null in getBukkitEntity() fix issue in Text 2012-08-12 14:39:44 +08:00
fullwall
0e817378ab Bugfixes, speed updates during pathfinding 2012-08-07 22:04:52 +08:00
fullwall
687200463b Trait commands act as toggle 2012-08-06 17:26:17 +08:00
fullwall
674974aa15 Fix traits/lookclose, use less memory in MCTargetStrategy, improve Behaviour (ie. scripts don't need to implement hashCode() any more) 2012-08-06 17:22:04 +08:00
fullwall
efadc1bf08 Move trait commands, /npc copy 2012-08-05 21:07:42 +08:00
fullwall
0c2ba89c55 Experimental change to use less memory for sockets - may break player NPCs 2012-08-05 14:21:34 +08:00
fullwall
e7244ba118 Forgot this 2012-08-05 14:16:11 +08:00
fullwall
32c7ef28bb Support spaces in names for /npc rename 2012-08-05 14:15:04 +08:00
fullwall
235b0faa36 Update for new YamlStorage constructor 2012-08-05 13:19:16 +08:00
fullwall
e96f3adf63 Change settings node 2012-08-04 23:19:22 +08:00
fullwall
ba1d245169 Derp 2012-08-04 22:08:47 +08:00
fullwall
4372b8c389 Provide /npc2 and /citizens2 aliases for commands for compatibility 2012-08-04 21:56:35 +08:00
fullwall
675052b8d9 Use collision vector from event 2012-08-04 13:39:04 +08:00
fullwall
a5a2f7f7ef CommandConfigurable interface, range/realistic looking settings added to LookClose and Text 2012-08-04 12:48:07 +08:00
fullwall
3a03525a41 C:/Program Files/Git/npc speed [speed] and speed/range saving 2012-08-03 22:30:11 +08:00
fullwall
ec9962b36f Move reflection into its own file 2012-08-03 21:18:10 +08:00
fullwall
8c7cfa88e9 Fix player movement, block villager trading 2012-08-02 22:51:10 +08:00
fullwall
28013dc689 Update for 1.3 2012-08-02 21:44:59 +08:00
fullwall
11fc67fff6 Use custom spawn reason 2012-07-28 16:22:03 +08:00
fullwall
b2253db67d Fix some issues with pathing/controllable 2012-07-28 16:15:12 +08:00
fullwall
588d491667 Implement NPCPush/CollisionEvent 2012-07-28 15:02:57 +08:00
fullwall
1957fa9c0d Implement pathfinding range methods in Navigator, make default range setting of 25F 2012-07-28 11:04:59 +08:00
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