Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-28 03:57:35 +01:00
Code Issues Projects Releases Wiki Activity
1,302 Commits 6 Branches 0 Tags 107 MiB
6a416bd7e1
Commit Graph

1302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mcmonkey
d9b79da086 Merge pull request #242 from mcmonkey4eva/master 
Pull request for damage control
 2015-02-16 14:34:14 -08:00
mcmonkey4eva
7185ece042 Revert "Test" 
This reverts commit bcca71d5bd.
 2015-02-16 14:32:25 -08:00
mcmonkey4eva
97468a4a65 Merge https://github.com/citizensdev/citizens2 2015-02-16 14:31:21 -08:00
mcmonkey4eva
7d8f0e0636 Fix build 2015-02-16 14:29:51 -08:00
fullwall
bcca71d5bd Test 2015-02-15 17:15:56 +08:00
fullwall
cc841ce0c7 Merge pull request #237 from mcmonkey4eva/master 
Fix rabbits not moving
 2015-02-15 11:42:44 +08:00
mcmonkey4eva
c04399eadf Prevent killer rabbits from attacking 
Thanks to morphan1 for helping to fix this bug
 2015-02-13 14:15:41 -08:00
mcmonkey4eva
735e5f9ec8 Fix rabbits not moving 
As a side effect, killer rabbits will attack, as E() encompasses both
movement and attacking. Not sure how to fix this... but moving+sometimes
attacking is better than never moving.
 2015-02-10 12:02:36 -08:00
sanjay900
0bea7bdc88 -p not -b 2015-02-03 11:24:28 +13:00
sanjay900
8b0003a456 its -p not -b 2015-02-03 11:16:13 +13:00
sanjay900
671eec9c02 Naming conventions. 2015-02-03 10:56:33 +13:00
sanjay900
8698312a87 Support setting permanent skins 
A permanent skin is set with ./npc skin -p name and will NOT change when
that player changes their skin, opening up lots more skin options.
To do this with code, set
npc.data().setPersistent(NPC.PLAYER_SKIN_UUID_METADATA, to the players
UUID/ Name and then
npc.data().setPersistent(NPC.PLAYER_SKIN_TEXTURE_PROPERTIES, "cache");
to tell the plugin to keep a permanent cache of their skin. Due to how
skins are implemented, these skins will work forever.
 2015-02-03 10:52:52 +13:00
sanjay900
6d1d4e73e0 Switch setPassengetOf to mount as it was removed in previous updates 2015-02-03 09:28:59 +13:00
fullwall
c1321c2162 Respect distanceMargin when NPCs are passively moving towards entities 2015-01-04 20:51:21 +08:00
fullwall
95993348bd Add /npc sheep 2015-01-04 19:59:33 +08:00
fullwall
950013f4f5 Fix AnimationTrigger 2015-01-04 19:41:41 +08:00
fullwall
28ea52c742 Fix tablist removing 2015-01-03 14:36:11 +08:00
fullwall
5b64a7cc57 Fix boolean value 2015-01-03 14:21:07 +08:00
fullwall
a46b1f440b Try playerlist handling via EntityTrackerEntry instead of adhoc event listening 2015-01-03 13:37:34 +08:00
fullwall
db205f52ff Better skin loading when world has to be loaded 2015-01-03 12:45:26 +08:00
fullwall
273a2b358c Reorder tablist refresh 2014-12-28 14:55:15 +08:00
fullwall
bc16fd739d Update MCTargetStrategy.java 2014-12-28 14:07:01 +08:00
fullwall
b8c580fa1b Merge pull request #171 from mcmonkey4eva/patch-1 
Don't attack players when they do /npc, fixes #170
 2014-12-28 14:06:06 +08:00
mcmonkey
3a6f7de36b Don't attack players when they do /npc, fixes #170 
Let's... let's not do this.
 2014-12-27 12:45:41 -08:00
fullwall
574faefa09 Merge pull request #155 from sanjay900/master 
Allow Rabbits to have their types set. Fix lots of broken commands. Add enums to commands.
 2014-12-26 17:47:42 +08:00
fullwall
bd5ff4d433 Update HumanController.java 2014-12-26 17:45:49 +08:00
fullwall
516035fc70 Fix NPC targeting 2014-12-21 23:34:54 +08:00
sanjay900
7eb1cfb6fb Change the wolf collar message to something that makes more sense 2014-12-19 15:50:25 +13:00
sanjay900
a174631d6f Fix the wolf colour command messages 2014-12-19 15:50:17 +13:00
sanjay900
6c17804653 Wolf Traits now give Feedback. 2014-12-19 00:16:31 +13:00
sanjay900
1447380e83 Fix set Profession, set skeletontype and set rabbittype commands 2014-12-18 23:52:32 +13:00
sanjay900
46e1ecdd2a Fix spacing, call setType, check if valid 2014-12-18 23:03:57 +13:00
sanjay900
0ed3235258 Appearently i was working off of an old copy of messages_en 2014-12-18 22:57:20 +13:00
sanjay900
f1ec5a2248 Im an idiot... 
Why did i set it every tick?
 2014-12-18 22:55:30 +13:00
sanjay900
249ef8ec41 Allow Rabbits to have their types set. 
Added command and trait.
messages_de, messages_fr and messages_nl need
citizens.commands.npc.rabbittype.set
citizens.commands.npc.rabbittype.invalid-type
 2014-12-18 22:36:44 +13:00
fullwall
954a3bd27b Add some settings to control NPC skin retries 2014-12-17 19:48:47 +08:00
fullwall
fc8d7e104d Merge pull request #147 from mcmonkey4eva/master 
Fix teleport bugging
 2014-12-12 11:37:45 +08:00
mcmonkey4eva
2ecddf6f87 Improve NPC pseudo-respawning 
In initial testing, longer periods were better. However, that was before
a lot of recoding... shorter periods are now superior and keeping
significantly more NPCs visible (When dealing with batches so large that
the system fails to load them all)
 2014-12-11 15:56:10 -08:00
mcmonkey
674bb60287 Fix teleport bugging 
Teleporting forcibly rounds locations because @fullwall edited the roundLocation function to return the original, now modified location, rather than clone it as is necessary to avoid trouble. This restores the original roundLocation which will avoid that error.
 2014-12-09 14:46:12 -08:00
fullwall
7ff6cfb364 Fix slime movement 2014-12-09 20:31:14 +08:00
fullwall
a6df72fa1b Refactoring, remove some allocations 2014-12-08 15:45:09 +08:00
fullwall
b5cda10271 Merge pull request #139 from mcmonkey4eva/patch-2 
First pass at removing NPCs from the playerlist
 2014-12-08 15:17:15 +08:00
mcmonkey4eva
50fa13cef0 Handle all cases of the packet in NMS.java 2014-12-07 18:04:13 -08:00
mcmonkey4eva
ab67c208d1 Refactor 
Move the playerlsit packet handling to the NMS class
 2014-12-06 19:07:06 -08:00
mcmonkey4eva
33ef7d2a55 micro-efficiency, improvements 
Don't call .getBlock which is both slow and doesn't work in all cases.
Also don't compare worlds by name, compare by instance.
 2014-12-05 22:11:03 -08:00
mcmonkey4eva
1c6a1cc719 Third pass: packet magic to pseudo-respawn NPCs 
also cache the NPC position to slightly improve efficiency. Micro-effic
matters a lot here.
 2014-12-05 22:06:03 -08:00
fullwall
7aeaa7becc Merge pull request #138 from mcmonkey4eva/patch-1 
Disable bat AI, fixes #137
 2014-12-06 13:35:50 +08:00
mcmonkey4eva
306138165f Second pass: error fixing, more invisibility fixes 
Handle teleporting, avoid cross-world errors.
 2014-12-04 16:12:45 -08:00
mcmonkey4eva
64ac8bed9e First pass at removing NPCs from the playerlist 
imperfect (causes pointless respawns) but a functional proof-of-concept.
 2014-12-03 23:48:37 -08:00
mcmonkey4eva
32042d10e8 Disable bat AI, fixes #137 
Bat AI wasn't overridden properly... now it is.
 2014-12-03 22:38:05 -08:00