themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
942 commits 1 branch 1 tag 88 MiB
Commit graph

49 commits

Author SHA1 Message Date
Lucas Nicodemus
5c59ebf71a Merge remote-tracking branch 'remotes/origin/general-devel' 
Conflicts:
	TShockAPI/Commands.cs
	TShockAPI/DB/GroupManager.cs
	TShockAPI/DB/RegionManager.cs
	TShockAPI/Properties/AssemblyInfo.cs
	Terraria.sln
 2011-07-23 17:25:20 -06:00
Zack Piispanen
732121bdf5 region basic tests added 2011-07-23 18:07:15 -04:00
Zack
1468bbaa85 width + x1 = x2... 2011-07-22 23:18:59 -07:00
Lucas Nicodemus
219f5a8cfb WorldIDs 2011-07-22 23:35:21 -06:00
Zack Piispanen
727ae2322b Added new commands to allow users in game to create, delete, modify groups. 
Added new methods to create, delete, modify groups.

Uhhh....dunno why RegionManager.cs was conflicted.

Added permission for accessing group commands
 2011-07-22 23:14:56 -04:00
high
64ca3e7148 Region list now uses the new code that warps use too. 2011-07-22 22:00:18 -04:00
Lucas Nicodemus
e1cd87f487 Fixed regions 
Added /convert
 2011-07-22 17:38:51 -06:00
Lucas Nicodemus
92d6e7b9fb No longer spam users to login. 2011-07-22 16:18:28 -06:00
Lucas Nicodemus
3291195af8 Fixed regions not working. 2011-07-22 16:15:34 -06:00
Lucas Nicodemus
b5a27052a1 Updates to RM 2011-07-22 14:10:38 -06:00
Lucas Nicodemus
b98614946d Changed every instance of Main.worldID.ToString() to Main.worldName. You broke backwards compatibility with all other warp and region files by doing that. 2011-07-21 15:03:15 -06:00
Lucas Nicodemus
0aea895a59 Import system now imports UserIDs 2011-07-21 12:31:11 -06:00
Lucas Nicodemus
cd018fed8d Regions are now UserID based. 2011-07-21 12:25:57 -06:00
Zack Piispanen
e5826fbc0a Converts Warps to db files, and fixes a bug in region code. 
Currently, the program fails to copy the old xml files to the new directory, so you may want to manually do that.
 2011-07-19 19:30:07 -04:00
Zack Piispanen
12674c3ce2 regions now convert from xml to db 2011-07-19 18:40:46 -04:00
Zack
c780993152 editted to save the db BEFORE refreshing the regions. 2011-07-19 09:36:36 -07:00
Zack
557d552956 Fixed for Bug 253, apparently someone forgot to clear the paramaeters before calling the next query. 2011-07-19 09:31:46 -07:00
Zack Piispanen
77998470bc Added worldID to where clause 2011-07-17 13:25:52 -04:00
Zack Piispanen
8e9bbcc5f9 Bug fix for region allow, updated the whole database, was missing a where clause 2011-07-17 13:18:04 -04:00
Lucas Nicodemus
cb5a50f540 /region allow now works (and adds users) 2011-07-16 18:21:39 -06:00
Lucas Nicodemus
add7c74bec Region allow now refreshes the region cache, but no longer operates properly. 2011-07-16 18:16:52 -06:00
Lucas Nicodemus
75e3e58c80 Regions WORK! 2011-07-16 18:01:18 -06:00
Lucas Nicodemus
acc5784d16 Fixed region detection 2011-07-16 02:34:16 -06:00
Lucas Nicodemus
0e9624ace3 Copied and pasted old region checking code. 2011-07-16 02:01:48 -06:00
Lucas Nicodemus
b98c84fa5b Attempting to fix region detection 
Attempting to fix /protect
 2011-07-15 22:56:51 -06:00
Lucas Nicodemus
9cdbcdb92c Protected actually sets values 2011-07-15 21:58:38 -06:00
Lucas Nicodemus
741841028e Attempting to fix region protection 2011-07-15 21:26:28 -06:00
Lucas Nicodemus
485bc61fac Code cleanup thanks to High6 2011-07-14 18:21:43 -06:00
Lucas Nicodemus
d45c7a5753 Fixed /region protect 2011-07-14 18:19:33 -06:00
Lucas Nicodemus
e87c497cbd Region up to date 2011-07-14 17:57:48 -06:00
Lucas Nicodemus
26e7b669cb Fixed returning false on any non-region. 2011-07-14 17:24:57 -06:00
Lucas Nicodemus
b9fb8cee55 Reload is actually called now. 
Most stuff in regions is starting to come together.
 2011-07-14 03:50:00 -06:00
Lucas Nicodemus
f4b4d041d9 Adding more misc functions for future use. 2011-07-14 03:31:25 -06:00
Lucas Nicodemus
751210d6ce Added Region.InProtectedArea 
Added Region.HasPermissionToBuildInRegion
 2011-07-14 03:16:31 -06:00
Lucas Nicodemus
9e012b3327 Fixed /tphere saying the wrong text 
More work on region fuck
 2011-07-14 03:00:19 -06:00
Lucas Nicodemus
a9eee56be4 Test (again) 2011-07-14 02:05:33 -06:00
Lucas Nicodemus
d24e5184a3 ci.tshock.co test 2011-07-14 02:00:30 -06:00
Lucas Nicodemus
5b79212b8f Tweaked around with the region code a lot. 
Databases will need to be rebuilt past this build.
 2011-07-14 01:47:57 -06:00
Lucas Nicodemus
c4efc96303 (Taking a break. If anyone wants to continue shit feel free. Just note that RegionStore.cs is completely useless because it turns out a Region class already existed. Oh and there's no constructor for it that contains allowed user IDs either, which is also dumb. 2011-07-13 22:58:59 -06:00
high
6468ed7562 This is not C, stop doing return codes especially without doing an enum. 
Databases can store other things besides strings.
If you do not like changes from this commit feel free to revert it. Just giving some last insight on this branch.
 2011-07-13 14:14:39 -04:00
Lucas Nicodemus
77ed57a4bd PRIMARY KEY, thanks SQLite for being a FUCKING DICKBAG 2011-07-13 02:47:32 -06:00
Lucas Nicodemus
2608ca0779 We want PRIMARY keys, not UNIQUE keys, because UNIQUE without PRIMARY means absolute BULLSHIT. 2011-07-13 02:42:06 -06:00
Twitchy
30d0d48386 Added reader closing (if it will help) and returns default group rather than "null" 2011-07-12 21:16:59 +12:00
Twitchy
b74455433e Changed Exception catch types. Removed trying to insert to ID field 2011-07-12 19:36:17 +12:00
Twitchy
3e17e42a37 Adds MySql Support 2011-07-12 13:31:36 +12:00
Twitchy
b5ca97ae35 Adds a whole bunch of SQL logging 2011-07-11 20:31:25 +12:00
Twitchy
243b0297b9 Commands /region list and /warp list now work 
Regions now use User ID's for /region allow (can be IP or Username/password based ID)
Minor Tweaks
A reset of your database is recommended
 2011-07-09 20:41:31 +12:00
Twitchy
cb7033d89c Adds UserManager to sql 
Changes the way Warps and Regions are stored
A few other minor tweaks
 2011-07-09 16:33:07 +12:00
Twitchy
16a90f3240 Added SQL Regions and Fixed SQL Warps 2011-07-08 23:36:53 +12:00