Tiger Wang
77468f87b7
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
source/Piston.cpp
Merge conflict?
2013-08-14 12:03:13 +01:00
Tiger Wang
4ae1750da2
Alpha sorted PistonBreakable list
2013-08-14 11:50:21 +01:00
madmaxoft
b1a892bd9a
Partially fixed tonibm19's mess.
2013-08-14 12:45:39 +02:00
Tiger Wang
303b1a9c45
Buncha bugfixes [SEE DESC]
...
Fixed generation values not being written
Fixed piston being able to push water
Fixed ice creating a non-source block (still doesn't update though)
Removed problematic piston code
2013-08-14 11:44:02 +01:00
Tiger Wang
7803bde6b6
Merge pull request #85 from tigerw/master
...
Fixed #57
2013-08-14 03:36:16 -07:00
madmaxoft
c0629a9a6e
Fixed player swimstate crash.
...
The check for swimming / submersion checks the Y coord first. Fixes #63 .
2013-08-14 10:33:26 +02:00
Tiger Wang
020ff36af2
YET ANOTHER ERROR >:(
2013-08-13 17:45:40 +01:00
Tiger Wang
27b400adf8
Credits
2013-08-13 17:44:01 +01:00
Tiger Wang
dd6450c2a9
Attempt three
...
This is extremely embarrassing...
2013-08-13 17:41:50 +01:00
Tiger Wang
a322bb275f
Attempt two
2013-08-13 16:47:44 +01:00
Tiger Wang
2b0541ab39
Attempt at fixing sleep issue
2013-08-13 16:42:02 +01:00
Tiger Wang
23a5fb1450
Removed more comments
2013-08-13 16:36:19 +01:00
Tiger Wang
9ec248eaa0
Fixes #57
2013-08-13 16:34:26 +01:00
STRWarrior
9ad3c52593
Keep players from taking damage when teleporting.
2013-08-12 02:52:32 -07:00
STRWarrior
83d3635e0b
Added quartz stairs.
2013-08-12 02:31:02 -07:00
madmaxoft
90ef9cfe97
Fixed logging into debug console.
...
Was missing the LF at the end.
2013-08-12 08:42:18 +02:00
Tiger Wang
d23b8e0c7c
Merge pull request #77 from tonibm19/patch-1
...
Now Endermans spawn in The End
2013-08-11 14:38:31 -07:00
Tiger Wang
b48651a034
Really removed comments this time
2013-08-11 21:08:20 +01:00
tonibm19
67351d7d7b
Now Endermans spawn in The End
2013-08-11 21:54:39 +02:00
Tiger Wang
1599d607d1
Merge pull request #74 from tigerw/master
...
Further attempt at fixing torch placements
2013-08-11 12:44:54 -07:00
madmaxoft
b58ca60815
Added doxyComments for cIsThread.
2013-08-11 18:46:49 +02:00
Tiger Wang
93f5a4388c
Removed unneeded case clause
2013-08-11 15:21:31 +01:00
madmaxoft
dd60f55bcc
Added the OnHopperPullingItem and OnHopperPushingItem hooks.
...
Requested in FS 412, slightly modified the params.
2013-08-11 14:57:07 +02:00
madmaxoft
d97b4463c6
Added an AllowEmptyStacks param to cItemGrid::HowManyCanFit().
2013-08-11 14:54:45 +02:00
Tiger Wang
e7ecd78312
Tried adding bracket
2013-08-11 12:08:09 +01:00
Tiger Wang
baae26ab22
Further attempt at fixing torch placements
...
Also fixed block on flower placement. #71
2013-08-11 11:58:57 +01:00
madmaxoft
deeb3a15dc
Added OnPlayerAnimation() hook.
...
Initial patch by @STR_Warrior, updated to account for different animation packets.
2013-08-11 12:29:05 +02:00
Tiger Wang
7e288850b1
Attempt at fixing torch placement
...
Attempt at fixing #71 and placement of torches.
2013-08-10 21:32:50 +01:00
Alexander Harkness
7d6bde3d93
Added back the required extra line in player.cpp
2013-08-10 17:40:52 +01:00
Tiger Wang
b999b27e05
Removed extra disconnect message
...
There seems to be already one in the HandleDisconnect hook function.
2013-08-10 17:09:14 +01:00
Tiger Wang
7035dbd7f1
Deleting cPlayer now does LOGD instead of LOG
...
Hopefully only prints in debug the debug message!
2013-08-10 16:59:48 +01:00
Alexander Harkness
e508e09753
Merge pull request #56 from mc-server/LinuxColorConsole
...
Linux color console
2013-08-10 04:40:38 -07:00
madmaxoft
15f80e0811
Linux color redirection fixed.
...
Outputting to stdin, yeah, right, that's gonna work :P
2013-08-10 13:07:49 +02:00
madmaxoft
19781ecad5
Coloring is reset before the LF.
2013-08-10 13:03:05 +02:00
madmaxoft
9794496571
Another Linux compilation fix.
2013-08-10 12:51:57 +02:00
madmaxoft
211a8395d4
Fixed Linux build.
2013-08-10 12:50:23 +02:00
madmaxoft
63b2fa21e8
Disabled coloring for redirected output.
2013-08-10 12:44:39 +02:00
madmaxoft
528feaba2c
Use printf() instead of puts().
...
puts() outputs an extra newline, making it unsuitable
2013-08-10 09:45:05 +02:00
madmaxoft
2a97bed3b4
Bad preprocesor used for discovering Linux
2013-08-10 09:42:20 +02:00
madmaxoft
d3c29c5a88
Piston head, when removed, removes the associated piston body, too.
...
Fixes FS 388
2013-08-10 08:22:53 +02:00
madmaxoft
72e2891017
Fixed squid crashing the server when above or below the world
2013-08-10 08:22:53 +02:00
madmaxoft
c85acd4ece
Renamed Plugin_NewLua to PluginLua.
2013-08-10 08:22:52 +02:00
madmaxoft
8fd67cf12a
First attempt at Linux console colors
...
Ref.: issue #41
2013-08-09 22:40:12 +02:00
Alexander Harkness
33155a51e2
Merge pull request #55 from mc-server/falldamage-teleport
...
Keep players from taking damage when teleporting. (Hopefully).
2013-08-09 12:36:45 -07:00
Alexander Harkness
e9b9f1861c
Fixed stupid syntax error (thanks build system).
2013-08-09 17:17:04 +01:00
Alexander Harkness
eaec6a4aab
Keep players from taking damage when teleporting. (Hopefully).
...
Fixes #29
2013-08-09 16:18:24 +01:00
madmaxoft
f89d6cc9af
Piston head, when removed, removes the associated piston body, too.
...
Fixes FS 388
2013-08-09 16:20:12 +02:00
madmaxoft
7c9c51425b
Fixed squid crashing the server when above or below the world
2013-08-09 15:53:43 +02:00
madmaxoft
7d70a06461
Renamed Plugin_NewLua to PluginLua.
2013-08-09 15:15:56 +02:00
madmaxoft
d4a3c451c4
Added OnExploding() and OnExploded() hooks.
...
As requested in FS 413, with extra parameters:
World, BlockX, BlockY, BlockZ, Size, CanCauseFire, Source, SourceData
OnExploding() can return 3 values:
StopHook, CanCauseFire, ExplosionSize
2013-08-09 14:58:43 +02:00
