1
0
Commit Graph

114 Commits

Author SHA1 Message Date
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
0f67f80c6e Added IsBlockWaterOrIce() 2014-02-02 21:48:21 +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
55cfb232db Possibly fixed #618 2014-02-02 19:10:22 +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
Tycho
c6304b2b4f Changed pointers to references 2014-02-01 05:06:32 -08:00
Tycho
fec17409d2 Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/World.h
2014-01-31 15:31:05 -08:00
Tiger Wang
d8aa0b0ec7 Improved code
* Fixed some issues
* Fixed standard violation
2014-01-31 00:04:57 +00:00
tonibm19
16a939a757 Attempt at implementing #563
Not tested (I don't have RasPi)
2014-01-30 18:02:37 +01:00
Tiger Wang
7d03876a3e Added LOGREPLACELINE for line replacement 2014-01-29 19:22:03 +00:00
STRWarrior
babc80ed77 The world can now be configured wether farmers should be able to harvest crops. 2014-01-27 22:02:19 +01:00
Tycho
bed2ee22e8 Merge branch 'master' into GeneratingBenchmark2
Conflicts:
	src/Blocks/BlockRail.h
	src/World.h
2014-01-26 06:28:51 -08:00
Tycho
14e48ccb4b Refactored cBlockHandler::OnUse and dependents 2014-01-26 06:20:39 -08:00
Tiger Wang
cdd6478cea Did what xoft recommended 2014-01-25 21:29:27 +00:00
Tiger Wang
314fc3cdac Mob bugfixes
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
2014-01-25 14:42:26 +00:00
andrew
4ef61d8bf6 Command block fixes 2 2014-01-23 14:57:04 +02:00
andrew
dd04f5a73c cWorld now saves/loads the scoreboard 2014-01-22 15:49:21 +02:00
andrew
9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew
aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02: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
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
Mattes D
972585363d Merge pull request #559 from mc-server/SpawnMobParticles
Removed the particles when a mob spawns.
2014-01-18 23:23:53 -08:00
Tycho
d93a4362b4 Fixed iterators bug 2014-01-18 10:57:25 -08:00
STRWarrior
1cced1664f Removed the particles when a mob spawns. 2014-01-18 19:41:31 +01:00
Tycho
160a27cced switched to using m_WorldAge rather than m_TickID 2014-01-18 06:15:33 -08:00
andrew
9a9b51a513 Basic command block implementation 2014-01-18 15:16:47 +02:00
Tycho
a54cbba0fd Added user setting compression factor 2014-01-17 11:01:14 -08:00
Tycho
287144839e Increased tick count to long 2014-01-17 10:23:40 -08:00
Tycho
ce030bc7c9 Implemented xsofts suggestion for a saturating counter in the scheduler 2014-01-17 10:07:33 -08:00
Mattes D
79c1f6f438 Merge pull request #534 from mc-server/SpawnMinecart
Added cWorld::SpawnMinecart.
2014-01-17 02:27:56 -08:00
Tycho
292ccdc09e added cWorld::ScheduleTask Function
ScheduleTask schedules a SceduledTask object to be run x ticks in the future.
In is exported to lua, fixes #150
2014-01-14 12:17:03 -08:00
STRWarrior
f11427e8cd Renamed cEmptyMinecart to cRideableMinecart 2014-01-12 18:04:41 +01:00
STRWarrior
c5603ce064 EmptyMinecarts should be able to get a block inside of them. 2014-01-12 15:27:50 +01:00
STRWarrior
6ff375273b Added cWorld::SpawnMinecart. 2014-01-12 14:33:32 +01:00
madmaxoft
cea997426b Decoupled cChunkGenerator from cWorld and cRoot.
Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
2014-01-10 22:22:54 +01:00
Tycho Bickerstaff
042b72bc17 rewrote queue not to use promises for waits 2014-01-02 12:32:55 +00:00
Tycho Bickerstaff
2e1588820d fixed warnings in World.cpp 2013-12-31 09:16:42 +01:00
STRWarrior
e9d1352f6e Implented BroadcastParticleEffect 2013-12-22 14:45:25 +01:00
madmaxoft
f5e6124ee0 Fixed the rest of constructor reorders. 2013-12-20 19:10:15 +01:00
Tiger Wang
3e6fd5c6e5 Removed some old cRedstone remnants 2013-12-16 17:35:20 +00:00
STRWarrior
c56af9a214 This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. 2013-12-15 10:51:46 +01:00
Tiger Wang
95be80cdb5 Implemented note block playing and fixed wire
Game of Thrones music in Minecraft, here I come!
2013-12-14 16:52:22 +00:00
Tiger Wang
97a1147aca Improved pickups spawning speed again 2013-12-09 23:43:06 +00:00
Mattes D
ac6b4cda7c Merge pull request #408 from mc-server/SpawnPoint_Fix
Now spawn points will not be in deep oceans or rivers etc.
2013-12-08 09:07:49 -08:00
STRWarrior
d85ea4f654 Now spawn points will not be in deep oceans or rivers etc. 2013-12-08 17:05:51 +01:00
Tiger Wang
1d554677b4 Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures
Conflicts:
	src/Bindings/Bindings.cpp
	src/Bindings/Bindings.h
	src/Blocks/BlockHandler.cpp
2013-12-08 14:02:45 +00:00
madmaxoft
044fd237b6 Moved bindings-related to a Bindings subfolder.
Ref.: #407
2013-12-08 12:17:54 +01:00
Tiger Wang
838d4d5d1d Bonemeal has particles, fixes #393 2013-12-07 23:45:33 +00:00
STRWarrior
c0f091b1a3 Added a SpawnFallingBlock function so plugins can make other blocks fall. 2013-12-07 14:26:52 +01:00
Tiger Wang
30ead79049 Renamed animation function
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
2013-12-06 23:47:07 +00:00
Tiger Wang
b028731726 Fixed duplication glitch with QueueSetBlock
If a coordinate was queued, and then the block there was broken, it
would reappear: double items!

Also now just sets meta if previous and current blocktypes matched.
2013-12-06 22:29:15 +00:00
Tiger Wang
e2a557f46c Added pickup invalid item check
They aren't spawned at all if their itemtype isn't valid; possibly fixes
the client crashing with bad pickups.
2013-12-06 20:39:42 +00:00
madmaxoft
e48168aa13 Lava can spawn fire.
Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
2013-12-04 19:48:42 +01:00
madmaxoft
c70c2fa42f Changed cBlockHandler->OnUpdate() to use cChunk directly. 2013-11-30 15:58:27 +01:00
madmaxoft
78f9d97459 Explicitly set spawnpoint fixes.
The value names are case-insensitive.
The debug message is printed only once.
2013-11-30 15:03:29 +01:00
madmaxoft
2383016b1d Added the real tick duration to the OnWorldTick hook. 2013-11-30 14:22:26 +01:00
Tiger Wang
994e1d7335 Made TNT pickups spawning chance 25% 2013-11-27 22:03:04 +00:00
Tiger Wang
a6630d3239 Merged master into redstonefixes 2013-11-27 21:35:13 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	VC2008/MCServer.vcproj
2013-11-26 17:21:06 +00:00
Alexander Harkness
66482c9db7 Fixed another one. 2013-11-26 17:06:00 +00:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	GNUmakefile
2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00