Tiger Wang
a3759c1462
Merge remote-tracking branch 'origin/master' into playerimprovements
2014-02-03 21:25:42 +00:00
Tiger Wang
3fc848c95a
Fixed #626
...
* Fixed consumption of carrots and potatoes
2014-02-03 21:16:26 +00:00
Tiger Wang
6bbba2644d
Fixed issues with farmland
...
* Fixed farmland reversion checks not taking into account carrots and
potatoes
* Fixed #623
2014-02-03 21:14:52 +00:00
Tiger Wang
b5e898a608
Server now handles join messages also
...
* Revised as well hook documentation
2014-02-03 21:12:44 +00:00
Mattes D
2450d0467f
Merge pull request #623 from mc-server/tnt
...
TNT improvements
2014-02-03 10:55:23 -08:00
madmaxoft
c9916cd8c2
Fixed socket leaking.
2014-02-03 17:07:46 +01:00
Tiger Wang
e3b9cdebc9
Inversed condition
2014-02-03 14:01:47 +00:00
madmaxoft
0b384198e5
SocketThreads: Fixed sending to closed socket.
2014-02-03 10:39:10 +01:00
madmaxoft
c2c1639af8
Groups.ini can contain spaces around commas in values.
...
This includes Permissions, Inherits and Commands.
Also fixed an unlikely but possible crash with group colors.
2014-02-03 10:39:09 +01:00
Mattes D
b090547c17
Merge pull request #602 from mc-server/improvementsandfixes
...
Redstone crash fix and current console line replace function
2014-02-02 22:02:25 -08:00
Tiger Wang
c1c7936c68
Fixed multiple invalid permission nodes
...
New players can build as default now
2014-02-02 22:55:41 +00:00
Tiger Wang
2d0b31e7b6
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-02-02 22:09:03 +00:00
Tiger Wang
ac03c51997
Fixed #624
2014-02-02 22:08:57 +00:00
Tiger Wang
0f67f80c6e
Added IsBlockWaterOrIce()
2014-02-02 21:48:21 +00:00
Tiger Wang
ba398c06d7
Uncommented pickup spawner code
2014-02-02 21:24:06 +00:00
Tiger Wang
d9a9052de7
Revert "Added LOGREPLACELINE for line replacement"
...
This reverts commit 7d03876a3e
2014-02-02 20:10:31 +00:00
Tiger Wang
6ef5c057aa
Revert "Improved code"
...
This reverts commit d8aa0b0ec7
2014-02-02 20:10:23 +00:00
Tiger Wang
f4c25ac445
Revert "Added a comment"
...
This reverts commit 7ae5631d89
2014-02-02 20:10:13 +00:00
Tiger Wang
ecbb9134a5
Revert "Properly initialised variables"
...
This reverts commit 02e7527893
2014-02-02 20:10:02 +00:00
Tiger Wang
dd3cc733ae
Revert "Fixed issues with insufficient console space"
...
This reverts commit 6b18add09b
2014-02-02 20:09:56 +00:00
Tiger Wang
e4b666989d
Revert "A newline issue is resolved"
...
This reverts commit 397208145e
2014-02-02 20:09:47 +00:00
Tiger Wang
070962fb8a
Revert "Fixed Linux compile"
...
This reverts commit 5becfe850a
2014-02-02 20:09:40 +00:00
Tiger Wang
a0242afec2
Revert "Another Linux fix"
...
This reverts commit 6f660b379e
2014-02-02 20:09:35 +00:00
Tiger Wang
5bf060f06c
Revert "Again improved LogReplaceLine"
...
This reverts commit dd325d742d
2014-02-02 20:09:15 +00:00
Tiger Wang
e56d41175b
TNT improvements
...
+ Added entity damage
+ Added entity propulsion
* Fixed #67 and fixed #230
2014-02-02 19:16:38 +00:00
Tiger Wang
55cfb232db
Possibly fixed #618
2014-02-02 19:10:22 +00:00
Mattes D
67d7d83726
Merge pull request #622 from worktycho/registerfix
...
Removed register keyword from Messinne Twister
2014-02-02 09:13:42 -08:00
Tycho
1e4e6c4619
Merge branch 'master' into registerfix
2014-02-02 09:11:53 -08:00
madmaxoft
c3d4cc4f4f
Fixed dark oak and acacia placement.
...
Fixes #621 .
2014-02-02 17:52:05 +01:00
Mattes D
3cfd9ce269
Merge pull request #615 from worktycho/GeneratingBenchmark2
...
Generating benchmark2
2014-02-02 07:25:30 -08:00
Tycho
42497847ac
Added missing files
2014-02-02 06:59:36 -08:00
Tycho
0b0aa5554f
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockTorch.h
2014-02-02 06:56:07 -08:00
Tycho
b82fc394dd
Changed Signiture of OnUpdate
2014-02-02 06:49:37 -08:00
Tiger Wang
b89419f603
Creative players take Plugin damage
2014-02-02 12:47:17 +00:00
Tiger Wang
275035eb70
Fixed #620
2014-02-02 12:43:57 +00:00
Mattes D
6f90b492b8
Merge pull request #617 from UltraCoderRU/master
...
Some fixes in wolves implementation
2014-02-02 02:35:24 -08:00
Kirill Kirilenko
a134fd45cf
Added saving of angry flag.
2014-02-02 14:28:42 +04:00
Kirill Kirilenko
a1c36c18e0
Fixed sitting tag.
2014-02-02 13:56:55 +04:00
Tiger Wang
dd325d742d
Again improved LogReplaceLine
...
* Fixed issues on Linux with cursor positioning
* Made preprocessor blocks more readable
* Improved reliability of line clearing on Windows
- Removed an *unneeded* variable
2014-02-01 21:44:23 +00:00
Tiger Wang
e26dc5cc0a
Added checks for ice into IsBlockWater()
...
* This fixes players spawning in vast oceans of ice, as opposed to the
previous water
2014-02-01 21:40:50 +00:00
Tiger Wang
b0784d1931
Split cCoord template into one and two data types
2014-02-01 21:40:02 +00:00
Kirill Kirilenko
2a52b390c0
Monster's nominal speed was increased.
2014-02-01 20:38:53 +04:00
Tycho
6e39ed3868
Changed Signiture of OnDigging
2014-02-01 08:35:48 -08:00
Kirill Kirilenko
0d33f2d11d
Fixed teleport to air, if owner is flying.
2014-02-01 20:22:12 +04:00
Kirill Kirilenko
0259aed8be
Added saving of collar's color.
2014-02-01 20:16:42 +04:00
Tycho
cf3b4ec226
Changed Signiture of OnDestroyedByPlayer
2014-02-01 06:01:13 -08:00
Tycho
4b5bd4dedf
Removed register keyword from Messinne Twister
...
Removed register as it is meaningless in c++ and causes a depreciated warning in clang 3.4 in c++ mode for va_copy
2014-02-01 05:14:31 -08:00
Mattes D
33759197e9
Merge pull request #585 from daniel0916/hooks
...
Added "player destroying" and "player destroyed" hooks
2014-02-01 05:08:08 -08:00
Tycho
c6304b2b4f
Changed pointers to references
2014-02-01 05:06:32 -08:00
daniel0916
b34ba6be7b
Added PlayerDestroyedHook Documentation
2014-02-01 13:58:35 +01:00
