Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-08 20:00:18 +01:00
Code Issues Projects Releases Wiki Activity
1,222 Commits 6 Branches 0 Tags 106 MiB
1447380e83
Commit Graph

1222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fullwall
35dccc8243 Fix player invisibility (note: they will appear on the tab list for now) 2014-12-01 13:40:46 +08:00
fullwall
b5dfbcade9 Update README.md 2014-11-30 14:29:46 +08:00
fullwall
20dadc38e8 Merge pull request #129 from CitizensDev/1.8 
1.8
 2014-11-30 14:22:13 +08:00
fullwall
7739e5df21 Fix tablist 2014-11-30 14:19:40 +08:00
fullwall
15efc9f838 Merge branch '1.8' of github.com:CitizensDev/Citizens2 into 1.8 2014-11-30 13:33:09 +08:00
fullwall
6ca4834e70 Fix player invisibility part 1 2014-11-30 13:32:35 +08:00
fullwall
72c176bf24 Merge pull request #126 from mcmonkey4eva/1.8 
Some error fixes
 2014-11-30 10:57:25 +08:00
mcmonkey4eva
f461dad41e Target API v14 2014-11-29 14:42:44 -08:00
mcmonkey4eva
a89afc29d6 Allow lowercase entity types 2014-11-29 13:51:20 -08:00
mcmonkey4eva
e786083e1e Add dependencies back, bump version 
build as 2.0.14, build against 1.8
 2014-11-29 13:35:06 -08:00
fullwall
1b02573b9c Add new entity controllers 2014-11-29 20:04:02 +08:00
fullwall
81872b6799 Update pass 1 to 1.8 2014-11-28 23:22:11 +08:00
fullwall
7e039a4a20 Minor style change 2014-11-26 14:12:13 +08:00
fullwall
2dfa2e660f Fix /npc name for 1.8 protocol 2014-11-26 13:41:24 +08:00
fullwall
15e157b676 Add help text about leaving the text editor 2014-11-20 16:29:13 +08:00
fullwall
8ae49480ae Set the default controllable behaviour to not require an owner (use the -o flag to require an owner) 2014-11-20 15:39:37 +08:00
fullwall
36b9a0c4c8 Hopefully fix NPC tablist issues 2014-11-17 10:32:16 +08:00
fullwall
3f95c57ea4 Add the skin flag set to all visible for 1.8 clients 2014-11-17 10:09:57 +08:00
fullwall
07b6c24f1d Fix monsters despawning when an NPC of the same type is spawned 2014-11-16 23:43:01 +08:00
fullwall
b10299a742 Ignore profile UUID lookup failures 2014-11-16 22:17:35 +08:00
fullwall
7008ffd013 Change NPC UUID version to 2 for Minecraft 2014-11-15 15:47:41 +08:00
fullwall
651fbac979 Minor fix for player tab list 2014-11-06 23:07:23 +08:00
fullwall
9048d0738a Merge pull request #111 from mcmonkey4eva/sit-anim-patch 
Fix the sit animation, fixes #96
 2014-11-04 15:45:10 +08:00
mcmonkey4eva
edbf8e6fda Fix the sit animation, fixes #96 
The task would fail to cancel properly, and sometimes fail to recognize
NPC removal.
In addition, gitignore maven and IntelliJ artifacts to give contributors
an easier time.
 2014-10-31 16:27:19 -07:00
fullwall
ec2eae62b7 Merge branch 'master' of github.com:CitizensDev/Citizens2 2014-10-08 01:12:48 +08:00
fullwall
7c441bdefd Send tablist packet globally 2014-10-08 01:12:22 +08:00
fullwall
3e2fd8516c Merge pull request #83 from mcmonkey4eva/master 
Fix NavigationStuckEvent set-null
 2014-10-05 23:34:38 +08:00
mcmonkey4eva
b5580ec70c Fix NavigationStuckEvent set-null 
If you set the action in a NavigationStuckEvent, it throws an NPE rather
than simply doing nothing. This patches that.
It also throws the event even when the default stuck action is null.
 2014-10-04 14:06:15 -07:00
fullwall
9eeae0c5b3 Implement NavigationStuckEvent 2014-09-25 15:32:03 +08:00
fullwall
aa360652f1 Optimise 1.8 playerlist hack 2014-09-17 21:45:17 +08:00