flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,120 Commits 1 Branch 0 Tags 92 MiB
ca3aa4ca06
Commit Graph

416 Commits

Author SHA1 Message Date
Tiger Wang
21ff1d81ab Improved explosion damage 2014-08-29 13:44:10 +01:00
LO1ZB
3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
Mattes D
d2d63b8a05 World: Report chunk count for the spawn area. 2014-08-22 10:35:51 +02:00
Mattes D
81d238e080 Added cWorld initializers. 2014-08-21 21:53:25 +02:00
Howaner
b5ffe06f88 Code formatting fixes. 2014-08-19 22:14:37 +02:00
madmaxoft
008c1cdaf4 CheckBasicStyle checks the src folder as well. 2014-08-14 01:03:30 +02:00
Howaner
47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
Howaner
42bad0edec Added a comment and simplified code. 2014-08-10 20:06:03 +02:00
Howaner
f90078c09f Added IsDaylightCycleEnabled saving. 2014-08-10 16:48:20 +02:00
Howaner
cccc321384 Renamed functions. 2014-08-10 16:46:03 +02:00
Howaner
32e1e9a553 Renamed m_DoDaylightCycle to m_CycleDaylight. 2014-08-08 22:07:30 +02:00
Howaner
4271d719b6 Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. 
I need this for a GameRule plugin.
 2014-08-07 01:07:32 +02:00
Tiger Wang
b5c0a4aa3a Fixed issues with autocomplete and time loading 
* Fixes #1274
 2014-08-01 22:15:34 +01:00
Mattes D
35cfbfd51a Merge pull request #1269 from Howaner/BlockEntitys 
Added beacon.
 2014-08-01 17:43:02 +02:00
Howaner
cfaef0de38 Capitalised "incremental" 2014-07-31 23:11:51 +02:00
Howaner
f47765dcbd Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator. 2014-07-31 18:21:45 +02:00
Howaner
81e095adda Exported the beacon. 2014-07-30 22:19:51 +02:00
madmaxoft
f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
Tiger Wang
4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Tiger Wang
8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
Howaner
a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
madmaxoft
c0b62ef139 Added a queue for setting chunk data. 
Fixes #1196.
 2014-07-24 18:32:05 +02:00
STRWarrior
9678341a11 Made the cWorld::SpawnMobFinalize function more readable. 2014-07-24 12:15:48 +02:00
Tiger Wang
1156914dd6 Suggestions 2014-07-23 21:12:59 +01:00
Tiger Wang
a28b0dc120 Speed improvements, crash fixes, & self-suggestions 2014-07-22 17:26:48 +01:00
Tiger Wang
0a15e1f420 Suggestion and failed merge fix 2014-07-22 10:33:16 +01:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
 2014-07-22 10:24:28 +01:00
Tiger Wang
8050a5b98a Suggestions 2014-07-21 22:49:06 +01:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
Tiger Wang
6ab9afd0fd Bug and crash fixes 
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
 2014-07-20 10:46:45 +01:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
archshift
11f8198a80 World.cpp: fixed not all enum fields being used in m_Dimension switch 2014-07-19 02:56:46 -07:00
Tiger Wang
719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
madmaxoft
2423fbf2ef Normalized comments. 
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
 2014-07-17 22:15:34 +02:00
madmaxoft
7fff12bfac Fixed spaces around single-line comments. 
There should be at least two spaces in front and one space after //-style comments.
 2014-07-17 19:13:23 +02:00
madmaxoft
993fd14ddf Fixed basic whitespace problems. 
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
 2014-07-17 16:33:09 +02:00
Mattes D
e444106d09 Merge pull request #1192 from mc-server/skinuuid 
Skins
 2014-07-16 13:30:57 +02:00
Tycho
57f4e871bb Fixed FindClosestPlayer 2014-07-15 12:52:02 +01:00
Tiger Wang
4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
worktycho
4a6d606f74 Made CreateProjectile a pointer 2014-07-13 15:16:49 +01:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
5f72cdac38 Merge pull request #1154 from mc-server/trappedchests 
Implemented trapped chests & others
 2014-07-12 23:24:32 +01:00
madmaxoft
9e22f46b15 Implemented support for forced chunk ticking. 
Fixes #1160.
 2014-07-10 18:18:32 +02:00
Tiger Wang
74b6b398e7 Fixed arrow collection animation 
* Fixed piston extension non-solidness
 2014-07-09 19:56:50 +01:00
Tiger Wang
9e44b0aae1 Implemented trapped chests & others 
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
 2014-07-06 23:50:22 +01:00
madmaxoft
632e8680b1 Removed world-saving log messages. 
Ref.: http://forum.mc-server.org/showthread.php?tid=1518
 2014-07-04 11:50:50 +02:00
Mattes D
9926abd4f5 Added generic entity-collecting. 
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
 2014-06-27 20:56:44 +02:00
Tiger Wang
7615ed90c0 Merge branch 'master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
 2014-06-21 22:14:23 +01:00
Tiger Wang
6e681269d9 Fixed invalid iterators 2014-06-21 22:07:38 +01:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Tycho
c82f4f6309 Fixed order of initalisation 2014-06-12 18:56:48 +01:00
Tiger Wang
29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00
Tiger Wang
bfa8aaf41b Merge branch 'master' into portals 
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
 2014-06-10 20:51:22 +01:00
Tiger Wang
35b79e5d71 Portal improvements and suggestions 2014-06-10 20:43:27 +01:00
madmaxoft
366ecf9dfd Fixed a race condition when adding a player to a world. 2014-06-10 18:25:53 +02:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d Added queue for adding entities to cWorld. 
This alone doesn't work properly yet, further changes to cPlayer are needed.
 2014-06-08 21:58:29 +02:00
worktycho
43342540c8 Fixed Time of day 2014-06-06 23:54:24 +01:00
Tiger Wang
156c9851b8 Suggestions 2014-06-05 17:58:29 +01:00
Tiger Wang
ea49abd113 Time and weather is saved, part of #1058 
Also fixed unreliability in Health and LootPickup loading.
 2014-06-04 20:52:54 +01:00
Tiger Wang
ccbf6cc446 Configurable portals 2014-06-04 20:00:55 +01:00
Tiger Wang
86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
Tiger Wang
8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
Tiger Wang
365c6f50bd Changed block send queue to use vectors 
As suggested by @worktycho.
 2014-05-29 11:57:06 +01:00
Tiger Wang
ee929793f0 Hopefully fixed piston duplication issues 
* Fixes #879
* Fixes #714
 2014-05-25 13:46:34 +01:00
Mattes D
dd350bc1f3 World pre-generation distance is settable in world.ini. 2014-05-09 18:32:04 +02:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
archshift
2c0bb7b717 Moved the weather picker out of TickWeather(), squashing a warning and improving readability. 2014-04-25 16:55:38 -07:00
archshift
c124fc39d4 Removed impossible default case. 
Squashed a warning.
 2014-04-25 16:32:34 -07:00
archshift
083cec5a09 Removed extraneous switch{} in Start() 
Squashed a warning.
 2014-04-25 16:27:15 -07:00
archshift
62e5234535 Small changes; warning fixing. 2014-04-24 20:25:03 -07:00
Mattes D
6492aa000b Merge pull request #909 from jfhumann/fixes 
Bug fixes and optimizations.

We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
 2014-04-22 13:34:32 +02:00
jfhumann
67344a3782 Merge remote-tracking branch 'origin/master' into fixes 
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
 2014-04-18 21:44:58 +02:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tiger Wang
200ea6254c Fixed #904 2014-04-18 12:54:17 +01:00
Tiger Wang
82b3d543e7 Rewrote redstone powering to use power levels 2014-04-15 13:15:56 +01:00
Tiger Wang
b3f6afefe9 Simplified pickup speed randomisation 2014-04-12 13:14:35 +01:00
madmaxoft
22794e7208 Fixed double projectile spawning. 
Two spawn packets were sent per projectile.
 2014-04-05 22:26:10 +02:00
madmaxoft
9032ff96c7 Removed unused constants. 
DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
 2014-03-25 23:35:50 +01:00
madmaxoft
b1ad3322e5 Fixed code style after recent merge. 2014-03-20 09:28:29 +01:00
Tiger Wang
3e49cada80 Added braces 2014-03-19 23:07:58 +00:00
Tiger Wang
0524d70774 ENUMified shrapnel level 2014-03-19 23:06:39 +00:00
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt 
Conflicts:
	src/ChunkMap.cpp
 2014-03-18 20:49:08 +00:00
Tiger Wang
23ffaa19b7 Added levels of shrapnel 2014-03-18 20:45:10 +00:00
Tycho
8b83c1a653 Merge branch 'master' into warnings 2014-03-14 06:46:20 -07:00
madmaxoft
35fe96b07d Fixed a warning. 2014-03-14 14:36:44 +01:00
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
d904e89712 Merge branch 'Werror' into warnings 
Conflicts:
	src/Globals.h
 2014-03-12 10:12:13 -07:00
Tycho
7e6ee7ef81 Fixed more Format issues 2014-03-11 14:43:14 -07:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang
e672988577 Merge remote-tracking branch 'origin/master' into awesometnt 
Conflicts:
	src/Items/ItemLighter.h
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-03-10 18:59:11 +00:00
Tiger Wang
cc2d805238 Merge branch 'master' into awesometnt 2014-03-10 18:36:55 +00:00
Tiger Wang
462829e23d Shrapnel now configurable 2014-03-10 18:35:02 +00:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys 
Add TNT load/save
 2014-03-09 21:44:32 +00:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles 
Conflicts:
	src/ClientHandle.cpp
 2014-03-09 12:53:50 +00:00
Tiger Wang
8f134adb6d Improved formatting of username tabcomplete 2014-03-09 12:48:55 +00:00
Howaner
527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00
Howaner
b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
Mattes D
f72c747b50 Merge pull request #763 from Howaner/BlockEntitys 
Add Flower Pots
 2014-03-07 17:54:10 +01:00
Howaner
c2090c0d11 Add Lua Bindings for FlowerPotEntity.h and add documentation. 2014-03-07 11:44:16 +01:00
Howaner
787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
madmaxoft
3e80e63665 Merge remote-tracking branch 'xdot/master' 2014-03-06 13:24:28 +01:00
Tiger Wang
53231bebd6 Added extra awesomeness to TNT 
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
 2014-03-05 22:12:48 +00:00
andrew
1ea17c0a75 Implemented vanilla-like fluid simulator 2014-03-05 15:54:38 +02:00
madmaxoft
e50ffba1ad Fixed an assert in map-loading. 
The maps were loaded too soon, the world wasn't initialized yet.
 2014-03-04 18:40:55 +01:00
madmaxoft
442c1d96fc Fixed previous weather changes. 
cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
 2014-03-03 20:55:04 +01:00
Mattes D
71ae689eb7 Merge pull request #746 from Howaner/Slabs 
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
 2014-03-03 20:52:08 +01:00
Howaner
1d67345989 Add cancelling to WeatherChanging event. 2014-03-02 21:04:01 +01:00
andrew
070d483236 cBlockInfo now manages the respective cBlockHandler 2014-03-02 21:25:05 +02:00
Howaner
5e427ee825 More documentation (thanks to madmaxoft) and use GetBlockTypeMeta 2014-03-02 16:16:22 +01:00
Howaner
e4b2502896 Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs 2014-03-02 16:01:37 +01:00
Tiger Wang
baf2d88921 Implemented ballistic missiles (fireworks) 
+ Added fireworks
 2014-02-26 23:33:52 +00:00
Tiger Wang
f77720c43f Merge pull request #669 from xdot/master 
Implementation of in-game maps :D
 2014-02-24 10:28:34 +00:00
andrew
f471873945 Maps: Improvements 2014-02-23 15:05:03 +02:00
Mattes D
191a08fc32 Merge pull request #700 from Howaner/GlobalFixes 
Add new Trees (without Generator)
 2014-02-20 16:24:52 +01:00
andrew
f201f4f176 Thread safe cMap manager 2014-02-20 16:38:37 +02:00
andrew
83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02:00
Mattes D
87db4b6a90 Merge pull request #697 from Howaner/Skull 
Add Skulls/Heads to MCServer
 2014-02-19 22:12:38 +01:00
Howaner
16f3809ded Add BlockNewLeaves.h and rename Darkoac to Darkoak 2014-02-19 19:18:40 +01:00
Howaner
a5a52fe160 Add new Trees (without Generator) 2014-02-19 16:58:31 +01:00
Howaner
d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
Howaner
52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
madmaxoft
b1c6b4f584 The cuboid for cWorld::SetAreaBiome() doesn't need sorting. 2014-02-18 13:49:24 +01:00
madmaxoft
803ea41236 Added cWorld:SetAreaBiome() API function. 
Fixes #675.
 2014-02-18 13:49:23 +01:00
andrew
3b24bc870b Map item handler; Fixed several bugs 2014-02-17 16:27:12 +02:00
madmaxoft
52cd9dfe9f Removed the unnecessary LoopPlayersAndBroadcastChat() functions. 2014-02-15 23:26:19 +01:00
madmaxoft
0f1f7583ae Implemented cCompositeChat. 
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678.
 2014-02-15 23:17:49 +01:00
andrew
5b92b877bc Send map when selected 2014-02-14 16:21:16 +02:00
andrew
32b465b8e1 IDCount Serialization 2014-02-13 21:36:24 +02:00
madmaxoft
9bb48a8fa4 Merged branch 'narroo/master'. 
This merges pull request #661.
 2014-02-13 17:04:25 +01:00
narroo
e53b331b4a Fixed formatting. Moved UnloadUnusedChunks from public to private. 2014-02-11 14:38:28 -05:00
narroo
d7f32ed682 Fixed formatting of previous commit. 2014-02-11 08:01:25 -05:00
madmaxoft
892c7eb57f More gcc warnings fixed. 2014-02-11 11:56:29 +01:00
narroo
e8e76a6058 Fixed bug #385. UnloadUnusedChunks now has the same interface as 
SaveAllChunks.  Meaning, QueueUnloadUnusedChunks and the supporting
cTaskUnloadUnusedChunks has been added.  Use QueueUnloadUnusedChunks from
now on to prevent deadlocking.
 2014-02-10 20:00:07 -05:00
madmaxoft
a184d59209 Merge remote-tracking branch 'origin/master' into ChunkStay 2014-02-09 09:36:42 +01:00
Tiger Wang
c68bdaf34b Fixed compile and some warnings in MSVS 2014-02-09 00:57:22 +00:00
Tiger Wang
9d1c9097e3 Merge remote-tracking branch 'origin/master' into playerimprovements 
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
 2014-02-09 00:14:42 +00:00
Tiger Wang
f86f066615 Merge branch 'master' into playerimprovements 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-02-09 00:04:42 +00:00
madmaxoft
ea71bfa9b6 Initial ChunkStay code. 2014-02-08 21:55:21 +01:00
STRWarrior
53475e36d5 Fixed comment. 2014-02-08 11:20:00 +01:00
STRWarrior
3a897844a0 Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). 2014-02-07 22:59:08 +01:00
STRWarrior
176664810b Implemented an easy way of adding new redstone simulators. 
Also added a "noop" redstone simulator that does the same as the fluid version.
 2014-02-07 22:13:55 +01:00
Tiger Wang
fadf3c037b Moved Gamemode setting into General root tag 2014-02-07 20:11:56 +00:00
Tiger Wang
0f36d1c122 Added sender name to PM if prefixes disabled 
* Also moved the PVP setting into Mechanics
 2014-02-07 20:10:12 +00:00
Tiger Wang
88a64ec40d Improved chat messaging functions 
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
 2014-02-07 18:58:52 +00:00
Alexander Harkness
b9aa0420a3 Merge pull request #646 from worktycho/warningfixes 
Fixed most of the reordering warnings
 2014-02-05 18:24:08 +00:00
Tycho
8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08:00
Mattes D
0ceb0ef607 Merge pull request #635 from tonibm19/master 
Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
 2014-02-04 09:23:03 -08:00
Tycho
80807eec2c Increased Type safety of Biomes 
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
 2014-02-03 12:26:17 -08:00
tonibm19
c2e7dd34d9 Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API 2014-02-03 20:52:11 +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
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