1
0
Commit Graph

3855 Commits

Author SHA1 Message Date
madmaxoft
0369c585fb Fixed a few compile-time and runtime warnings in ScoreboardSerializer. 2014-01-24 09:58:40 +01:00
madmaxoft
b02940209d Fixed crash with failed entity-loading.
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
2014-01-24 09:57:12 +01:00
madmaxoft
ebc3f6aa28 APIDump: Fixed indent after merge. 2014-01-24 08:59:21 +01:00
madmaxoft
8a254faaf7 Merge remote-tracking branch 'MikeHunsinger/master' 2014-01-24 08:55:41 +01:00
madmaxoft
22d101034f Fixed flint&steel failure on the Y world edges. 2014-01-24 08:53:49 +01:00
Mike Hunsinger
7c12247263 Fixed indentation once and for all. 2014-01-23 20:11:10 -07:00
Mike Hunsinger
9926ea58e8 Fixed indentation and doxygen comments... For real this time. 2014-01-23 20:01:08 -07:00
Mike Hunsinger
11948b1d4b Fixed spacing and doxycomments. 2014-01-23 19:54:00 -07:00
Mattes D
0e10120fc7 Merge pull request #580 from xdot/master
Fixed scoreboard serialization
2014-01-23 13:37:20 -08:00
Alexander Harkness
e21dcb3809 Merge pull request #582 from worktycho/BindingsMove
added dependecies for bindings regen
2014-01-23 11:56:12 -08:00
Tycho
b95e005d91 Make clean now effects Bindings 2014-01-23 11:06:42 -08:00
andrew
b21b682d85 Fixed 1.5.x scoreboard packet IDs 2014-01-23 21:06:05 +02:00
Tycho
ce2fb844aa Removed Bindings folder subcmake on *nix 2014-01-23 11:03:49 -08:00
Tycho
27d1d5d491 Bugfixes 2014-01-23 11:00:36 -08:00
Tycho
e0956be0a7 added dependecies for bindings regen 2014-01-23 10:41:08 -08:00
madmaxoft
435eae3858 Fixed crash while calling disabled plugins. 2014-01-23 16:14:00 +01:00
andrew
5c04e216eb Fixed scoreboard.dat structure 2014-01-23 16:42:01 +02:00
andrew
bafa0347a3 Fixed scoreboard serialization 2014-01-23 16:27:23 +02:00
Mattes D
9ae31d913c Improved code safety for the Compact world storage.
That was a huge chunk of smelly code.
2014-01-23 14:21:56 +01:00
Mattes D
97ee3340e3 Minor style improvements for the merged PR. 2014-01-23 14:14:33 +01:00
Mattes D
0526ed327c Merge remote-tracking branch 'xdot/master'
* xdot/master:
  Command block fixes 2
2014-01-23 14:06:05 +01:00
andrew
4ef61d8bf6 Command block fixes 2 2014-01-23 14:57:04 +02:00
Mike Hunsinger
00d7317746 Removed extra line 2014-01-23 00:53:00 -07:00
Mike Hunsinger
41b05416c7 Split TossItem into three Toss functions (Held, Equipped and Pickup) 2014-01-23 00:27:39 -07:00
madmaxoft
3b96fc1e54 Authenticator: Reduced logging levels. 2014-01-22 22:06:48 +01:00
STRWarrior
bcda30526d Merge pull request #574 from tonibm19/patch-1
Fixed compilation on VC2008
2014-01-22 08:07:26 -08:00
tonibm19
d59a0156ce Fixed compilation on VC2008 2014-01-22 16:58:25 +01:00
Mattes D
26586fdb92 Merge pull request #566 from xdot/master
Scoreboard
2014-01-22 06:05:17 -08:00
andrew
dd04f5a73c cWorld now saves/loads the scoreboard 2014-01-22 15:49:21 +02:00
madmaxoft
a6661e899a InfoDump: Can dump a single plugin without LFS. 2014-01-22 12:41:19 +01:00
madmaxoft
f58d11fc1a InfoDump: Dump all referenced permissions. 2014-01-22 10:18:58 +01:00
madmaxoft
2a018cfa49 Implemented cPluginManager:CallPlugin() API.
This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all.
2014-01-21 23:00:35 +01:00
andrew
9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew
fa4750f015 Scoreboard SendTo() 2014-01-21 19:43:13 +02:00
andrew
aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02:00
Alexander Harkness
9c93ab15ab Fix a crash but somewhere... 2014-01-20 19:02:37 +00:00
andrew
ff2302ebd5 Scoreboard serialization 2014-01-20 16:45:40 +02:00
andrew
7728f4bcbe Scoreboard deserialization 2014-01-20 16:10:39 +02:00
madmaxoft
2407a67906 APIDump: Added notes about objects across cWorld's task execution. 2014-01-19 23:56:49 +01:00
madmaxoft
e9e9593e6d APIDump: Updated cWorld:ScheduleTask()'s description. 2014-01-19 23:50:49 +01:00
madmaxoft
41618bf242 Changed the cWorld::ScheduleTask() signature.
Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
2014-01-19 23:49:19 +01:00
madmaxoft
4a01879911 cLuaState can now check function params. 2014-01-19 23:45:26 +01:00
Mattes D
865016abe2 Merge pull request #569 from worktycho/EnchantmentsFix
Enchantments fix
2014-01-19 13:50:50 -08:00
Mattes D
fde8b0be60 Merge pull request #565 from mc-server/commandblockfixes
Command block fixes
2014-01-19 13:47:52 -08:00
Tiger Wang
e4c3d799ff Removed unneeded paramters 2014-01-19 19:42:25 +00:00
madmaxoft
3c0e8c8da0 Rewritten SocketThreads for proper shutdown scenario.
This fixes #560 and #390.
2014-01-19 19:31:43 +01:00
madmaxoft
cce063b0cd Added graph of SocketThreads state transitions.
This graph has been used for #560.
2014-01-19 18:37:37 +01:00
Tycho
f13a14d2cf Switched EnchantmentSerilizer to namespace 2014-01-19 08:52:45 -08:00
Mattes D
6976735a53 Merge pull request #551 from worktycho/schedular
Implemented xoft's suggestion for a saturating counter in the scheduler
2014-01-19 07:46:34 -08:00
Tycho
e14ddff1c0 Spilt Writing of Enchantments to seperate class
Created a new class cEnchantmentSerializer to serilize Enchantments to NBT.
This breaks a dependecy chain between cChunkGenerator and cWorld.
cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments
so having it seperate reduces the spread of the frein modifier
2014-01-19 07:38:59 -08:00