1
0
Commit Graph

1068 Commits

Author SHA1 Message Date
Mattes D
87db4b6a90 Merge pull request #697 from Howaner/Skull
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
andrew
58a708825f cMapDecorator: Implemented random rotations 2014-02-19 20:57:14 +02: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
andrew
4a1ac57408 Documented cMap 2014-02-19 15:28:48 +02:00
Howaner
823ee3a125 Add break to Protocol17x.cpp and use new comment delimiter 2014-02-19 14:12:34 +01:00
Tiger Wang
a686656253 Merge branch 'master' into itemframes
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
2014-02-18 22:13:44 +00:00
Mattes D
98332c5b76 Merge pull request #696 from mc-server/paintings
Implemented paintings, fixes #689
2014-02-18 23:08:12 +01:00
Tiger Wang
08229956ff Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes 2014-02-18 22:07:30 +00:00
Tiger Wang
8b2153ba97 De-breaked stuff 2014-02-18 22:07:21 +00:00
Tiger Wang
5b961453d1 Fixed possible ASSERT failure 2014-02-18 21:54:53 +00:00
Tiger Wang
05789f9e66 Changed BlockFace type to eBlockFace 2014-02-18 21:33:33 +00:00
Howaner
52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
andrew
393ca0221d Map decorators; Map clients 2014-02-18 20:50:08 +02: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
madmaxoft
fc8743df96 Added a bit more documentation to cForEachChunkProvider. 2014-02-18 13:49:23 +01:00
Tiger Wang
9c409fc65c Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes 2014-02-18 11:44:19 +00:00
Tiger Wang
d5ee899d0e Added a brace
====
{       }
{  __  }
{  | |  }
====

REMOVE ALL THE BRACES!!
2014-02-18 11:44:09 +00:00
Tiger Wang
6788dbe7f2 Properly exported and documented paintings 2014-02-18 11:37:45 +00:00
Tiger Wang
7a23e27fc5 Added an explanatory comment 2014-02-18 00:29:10 +00:00
Tiger Wang
ced6eb971d Comments & new BLOCK_FACE constants 2014-02-18 00:28:31 +00:00
Tiger Wang
320cc74f0a Implemented paintings, fixes #689
+ Implemented paintings
2014-02-18 00:16:03 +00:00
Tiger Wang
7c0d11fbb2 Used new BLOCK_FACE constants
Also added more comments
2014-02-17 23:38:25 +00:00
Tiger Wang
464ec47eb7 Implemented item frames, a part of #689
+ Implemented Item Frames
* Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
2014-02-17 23:00:03 +00:00
madmaxoft
1a26f05ed0 Added cPluginManager:GetPluginsPath() to the Lua API. 2014-02-17 23:36:39 +01:00
madmaxoft
865ae82114 Add Lua plugin path to package.path and .cpath.
Fixes #693.
2014-02-17 23:12:46 +01:00
Howaner
777041806f Add Skulls/Heads 2014-02-17 20:14:08 +01:00
Alexander Harkness
72d312ac9b Merge pull request #690 from tonibm19/master
Now mobs can't escape from fences.
2014-02-17 16:12:59 +00:00
tonibm19
8707f7ddc8 Improved formatting 2014-02-17 17:01:22 +01:00
andrew
3b24bc870b Map item handler; Fixed several bugs 2014-02-17 16:27:12 +02:00
Alexander Harkness
d47e0b055b Merge pull request #692 from mc-server/wolfcleanup
Wolf cleanup
2014-02-17 10:21:38 +00:00
madmaxoft
a4ff63f223 Fixed a memory leak in CompositeChat. 2014-02-17 10:15:18 +01:00
madmaxoft
ea55a22a71 Links sent via chat messages are clickable.
Fixes #658.
2014-02-16 23:51:32 +01:00
madmaxoft
4a24e39ac1 Implemented cCompositeChat::ParseText(), incl. self-test. 2014-02-16 23:32:08 +01:00
madmaxoft
b0dbe51210 Fixed cBoundingBox self-test code-style.
Also made the class name unique and the global variable static, to avoid linkage problems with other self-tests
2014-02-16 23:32:08 +01:00
Mattes D
b90c9936b8 Merge pull request #683 from mc-server/redstoneimprovements
Redstone speed improvements
2014-02-16 21:44:15 +01:00
tonibm19
60bcf2807a Now mobs can't escape from fences. 2014-02-16 18:18:07 +01:00
Tiger Wang
2350b77bb5 Fixes to previous commit 2014-02-16 17:08:49 +00:00
Tiger Wang
1a84102b10 Slight cleanup of wolf code 2014-02-16 13:47:55 +00:00
Mattes D
ec37e53465 Merge pull request #686 from Howaner/GlobalFixes
Add Locale to ClientHandle
2014-02-16 14:46:36 +01:00
Tiger Wang
4908b6f500 Fixed minor formatting issues from #682
- Removed unused PlaySoundEffect
* Simplified and parenthesised code
2014-02-16 13:37:36 +00:00
Howaner
48d28a0f94 Add Locale to ClientHandle 2014-02-16 13:26:07 +01:00
Tiger Wang
55a6306e2b Fixed a glaring bug with chunk cross-simulating
* A chunk's redstone blocks list is no longer touched if AddBlock was
being called with another chunk's coordinates
* Fixed chunk boundary checks
2014-02-16 00:45:14 +00:00
Howaner
707916b404 Replace random Float Generation and broadcast the Exp Pickup Sound 2014-02-16 01:25:39 +01:00
Howaner
f3bd288f02 Add Exp Bottle Effects 2014-02-16 01:19:30 +01:00
Howaner
507a8a4b84 Set max. Players in the Tablist to 60 2014-02-16 01:18:57 +01:00
Howaner
d15d6acc58 Disable Hunger Death 2014-02-16 01:18:10 +01: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
Tiger Wang
d273cc4142 Added a 'default:' for SimChunk()'s switch 2014-02-15 20:22:51 +00:00
Tiger Wang
c494d0f6f2 A fix and an improvement
* Fixed a special case with the wrong ChunkX/Z values being used to
calculate a relative position
* Simplified data structure adding and removing operations (no more
pointers!)
- Removed one character of whitespace :D
2014-02-15 19:56:45 +00:00
Alexander Harkness
584f7bd806 Merge pull request #679 from mc-server/NotchDeath
NotchApple
2014-02-15 19:04:13 +00:00
STRWarrior
0040a88b9b If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch 2014-02-15 19:51:05 +01:00
andrew
cf96e69716 cMap::UpdateRadius 2014-02-15 20:06:47 +02:00
Tiger Wang
8fbb936b63 Fixed TNT fizzing everywhere 2014-02-15 15:53:02 +00:00
Tiger Wang
6eeeb2aa01 Sizeable speed improvements to redstone
+ Moved all simulator data into individual chunks
* Cleaned up parameters for functions and some code
* Fixed repeaters powering off faster than they power on

The main issue before was that, although the redstone simulator stored
blocks to be simulated in individual cChunks, other data, such as
powered lists, and etcetera, were global regardless of which chunk was
being simulated. Therefore, with worlds with lots of redstone, each tick
saw the ticking of chunks, which themselves iterated through the entire
dataset needlessly, creating LOTS of lag. Should be better now :)
2014-02-15 15:51:49 +00:00
Howaner
70a0dcb1eb Add more Sounds to Redstone Simulator 2014-02-15 16:30:28 +01:00
Howaner
87e79de4b7 Add Fence Gate to Redstone Simulator 2014-02-15 16:30:27 +01:00
Mattes D
48eafee823 Merge pull request #664 from mc-server/generalfixes
General fixes
2014-02-15 15:06:23 +01:00
Tiger Wang
b0fd5511ea Fixed typographical error 2014-02-15 13:55:58 +00:00
Tiger Wang
c6a2e8c688 Removed debug messages again 2014-02-15 12:58:17 +00:00
Alexander Harkness
a57c8bd7da Merge pull request #677 from mc-server/BroadcastParticleEffect
Broadcast particle effect
2014-02-15 10:52:31 +00:00
STRWarrior
ceb16ea2f7 Exported cWorld::BroadcastParticleEffect. 2014-02-15 11:38:20 +01:00
andrew
c7fb000858 EmptyMap item handler 2014-02-14 17:38:22 +02:00
andrew
5b92b877bc Send map when selected 2014-02-14 16:21:16 +02:00
Tiger Wang
f4f0099947 Added proper debug messages 2014-02-13 20:20:37 +00:00
Tiger Wang
c0e7d6fec9 Fancy stuff with constant references 2014-02-13 19:57:23 +00: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
andrew
92e85cc960 Implementation of in-game maps 2014-02-13 17:13:09 +02:00
Tiger Wang
6ed4f476ce Added more missing GetClassStatic()s 2014-02-12 22:06:59 +00:00
Tiger Wang
e915a0df4c Removed some unneeded BroadcastWholeWindow()s 2014-02-12 22:06:13 +00:00
Tiger Wang
f97ce30151 Changed inheritance a bit
* cBlockEntityWithItems now inherits from cBlockEntityWindowOwner
2014-02-12 22:01:22 +00:00
Tiger Wang
91ebb6cef0 Made player jump reset less ambiguous 2014-02-12 21:53:46 +00:00
Tiger Wang
7ced2f290f Simplified Attack() tracing 2014-02-12 21:53:21 +00:00
STRWarrior
8470841f84 Fixed #573 2014-02-12 19:07:17 +01:00
Tiger Wang
a0a44b969e Improved pressure plates
+ Two (or more) pressure plates can be triggered at the same time
* Fixed issues caused by pressure plates not being in the sources list
2014-02-11 23:13:49 +00:00
Tiger Wang
9d54f2b761 Fixed #190
+ Hoppers now collect pickups above them
2014-02-11 22:54:01 +00:00
Tiger Wang
06239c8336 Fixed #627
- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
2014-02-11 22:09:56 +00:00
Tiger Wang
c53406f0d4 Fixed #612
* Chests send contents updates to client
2014-02-11 22:04:11 +00:00
narroo
e53b331b4a Fixed formatting. Moved UnloadUnusedChunks from public to private. 2014-02-11 14:38:28 -05:00
madmaxoft
a1e01ff725 cWorld:ChunkStay() accepts nils as callbacks.
Also removed leftover debug logging.
2014-02-11 15:04:35 +01:00
madmaxoft
33c84aaa4d Added cLuaState::CheckParamFunctionOrNil().
Also fixed error reporting for the two function-checking functions.
2014-02-11 15:03:35 +01: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
madmaxoft
2559aa58f4 Made cChunkStay's destructor virtual. 2014-02-11 11:46:19 +01:00
madmaxoft
7e80b04114 Fixed gcc warnings in Item.h. 2014-02-11 11:30:11 +01:00
madmaxoft
b41bb3bb44 Fixed nested plugin function calls. 2014-02-11 08:52:14 +01:00
madmaxoft
8a8997cc38 Merge branch 'master' into ChunkStay 2014-02-11 08:50:30 +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
de7bf126db Added LuaChunkStay to Bindings sources.
This should fix *nix compilation. Also alpha-sorted the lists.
2014-02-10 23:23:04 +01:00
madmaxoft
9cebc9157c Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay().
This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready.
2014-02-10 22:47:10 +01:00
madmaxoft
589a4839df cLuaState: Stack traces don't include ghost 0-th element. 2014-02-10 22:44:56 +01:00
madmaxoft
5aa1123f70 Added cPluginLua::cOperation.
This class should be used to lock-and-access the plugin's LuaState. cPluginLua::GetLuaState() is unsafe and by this commit obsolete.
2014-02-10 20:38:02 +01:00
worktycho
7ad4a86c49 Added additional parenthasies 2014-02-10 18:06:49 +00:00
Tycho
9f542ee0f8 Merge branch 'master' into boatsFix
Conflicts:
	src/Items/ItemBoat.h
2014-02-10 10:01:50 -08:00
worktycho
23f69bc093 Fixed stupid mistax in conditional
boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one.
2014-02-10 17:59:17 +00:00
tonibm19
75e0b38d83 Maybe fixed boat placing 2014-02-10 18:17:44 +01:00