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

2105 Commits

Author SHA1 Message Date
nesco
c868d31377 Update Giant.cpp 2013-11-15 14:06:58 +01:00
Daniel O'Brien
1b2e6e7473 added cProtocol function to pass xp to client 2013-11-15 22:42:09 +11:00
madmaxoft
ee1ac65e54 cChunkDesc::GetBlockEntity() re-creates block entity when blocktype doesn't match. 2013-11-15 11:33:24 +01:00
madmaxoft
49d6afd501 Removed cBlockEntity:CreateByBlockType() from the Lua API. 
Plugins cannot be allowed to create block entities, that would result in memory leaks.
 2013-11-15 10:15:27 +01:00
madmaxoft
90fc51c4d0 cRoot::SaveAllChunks() doesn't wait for the save (deadlocks). 
Rather, it only queues the save task onto each world's tick thread.
 2013-11-15 10:13:32 +01:00
madmaxoft
ebb2ccaa26 Removed BlockEntities' constructors from the API. 
Plugins shouldn't construct block entities, rather, they will query them either from the cWorld (while playing), or from cChunkDesc (while generating).
 2013-11-15 09:49:56 +01:00
Daniel O'Brien
af17faac45 Merge remote-tracking branch 'upstream/master' into playerxp 2013-11-15 18:25:20 +11:00
Tiger Wang
15c330664a Fixed arrow bugs 
* Fixed arrows hitting blocks wrong
 2013-11-14 22:39:14 +00:00
nesco
8fa4f38202 Update Giant.cpp 2013-11-14 23:15:19 +01:00
Daniel O'Brien
f6e16ce150 cProtocol add SendExperience() and debugging 2013-11-15 08:35:02 +11:00
Samuel Barney
570aedb927 Fixed growing issue with crops. 2013-11-14 09:53:09 -07:00
madmaxoft
4533fc34ec Added cNoteEntity to Lua API. 
Ref. #228.
 2013-11-14 17:14:54 +01:00
madmaxoft
efb6f598bc Exported cJukeboxEntity to Lua API. 
Ref. #228
 2013-11-14 16:05:55 +01:00
Daniel O'Brien
ea778c7027 fixed XpGetPercentage 2013-11-15 01:46:41 +11:00
madmaxoft
082573771f Added cSignEntity into API, added cChunkDesc:GetBlockEntity(). 
This fixes both #228 and #347.
 2013-11-14 15:37:09 +01:00
Alexander Harkness
3328c80aec Fixed another one. 2013-11-14 07:42:54 +00:00
Alexander Harkness
444e6e4fa7 Silenced yet another not completed enum warning. 2013-11-14 07:42:03 +00:00
Alexander Harkness
dc94b92753 Silenced another warning. 2013-11-14 07:38:59 +00:00
Mattes D
79a98627a2 Merge pull request #344 from marmot21/playerxp 
PlayerXp
 2013-11-13 23:04:43 -08:00
Daniel O'Brien
dbc2694b0f fixed function name 2013-11-14 16:48:14 +11:00
Daniel O'Brien
21bd1d74a1 luaExport 2013-11-14 16:20:27 +11:00
madmaxoft
99da44095a Fix for NULL arithmetic compiler warning in Linux. 2013-11-13 22:54:01 +01:00
madmaxoft
a8cf6edab0 Merge remote-tracking branch 'origin/WolfUpdate' 
Conflicts:
	source/Mobs/Wolf.h
 2013-11-13 22:38:34 +01:00
Alexander Harkness
56c23305d5 Added the last bit of the enum, and alpha-sorted the switch. 2013-11-13 20:13:35 +00:00
Daniel O'Brien
d5c6d0666e fixed comment 2013-11-14 07:12:16 +11:00
Alexander Harkness
3ea3da8b3f Removed unnecessary format data. 2013-11-13 20:09:24 +00:00
Daniel O'Brien
b0be6cb02d changed function name 2013-11-14 07:07:57 +11:00
Daniel O'Brien
8c6bdca425 minor changes 2013-11-14 07:02:53 +11:00
madmaxoft
5ebbdb4d51 Implemented the "help" console command in the server. 
Fixes #42.
 2013-11-13 20:40:18 +01:00
Daniel O'Brien
c17f77cf2a changed name convention 2013-11-14 04:41:36 +11:00
Daniel O'Brien
bf2dc38f35 Fixed problems with code style etc 2013-11-14 04:25:47 +11:00
madmaxoft
1701b628cb Console "reload" command implemented in MCServer, rather than in a plugin. 
First part of #42.
 2013-11-13 15:56:40 +01:00
madmaxoft
991f7d2315 cPluginManager:BindCommand() and :BindConsoleComman() now report full Lua stacktrace on failure. 2013-11-13 15:54:56 +01:00
madmaxoft
ceee25bd11 Fixed compiler warning. 2013-11-13 15:53:03 +01:00
madmaxoft
a8ad7c2383 PluginManager::Bind displays more information in the error message. 2013-11-13 15:50:24 +01:00
Daniel O'Brien
39f6b12b62 Merge remote-tracking branch 'upstream/master' into playerxp 2013-11-14 01:16:23 +11:00
Daniel O'Brien
875bca5fb9 Player Xp, includes get/set and addExperience 2013-11-14 01:07:24 +11:00
Daniel O'Brien
fc0b6adf51 Player Xp, includes get/set and addExperience 2013-11-14 01:05:58 +11:00
Mattes D
f0febc2fca Merge pull request #339 from nesco/master 
Bug correction
 2013-11-13 06:04:24 -08:00
nesco
7d615ee3ba Bug correction 
Syntax error
 2013-11-13 14:57:54 +01:00
Daniel O'Brien
3b47a07bac Player Xp 2013-11-14 00:50:47 +11:00
Mattes D
8efc04328d Merge pull request #337 from nesco/master 
Updating enchantments list and ID/Metas List and some properties to the 1.7.2 version of Minecraft
 2013-11-13 05:34:13 -08:00
nesco
e671f29d85 compatibility update 2013-11-13 14:29:18 +01:00
madmaxoft
293051eca8 Merge remote-tracking branch 'origin/fixes'. 2013-11-13 11:08:51 +01:00
nesco
f99835c095 compatibility update 2013-11-13 08:19:28 +01:00
nesco
ffe4de51c7 Update Enchantments.cpp 2013-11-13 08:17:26 +01:00
nesco
e4d77bc3fd Update Enchantments.h 2013-11-13 08:16:35 +01:00
Tiger Wang
347162a82f Bundled fixes [SEE DESC] 
* BoundingBox now returns FACE_NONE
+ Arrows can be picked up
* Arrows dug up resume physics simulations
* Added sound effects for bows, lava to stone, and arrows
* Fixed SoundParticleEffect on <1.7 protocols
 2013-11-12 21:43:20 +00:00
nesco
d58723cc4d Delete BiomeID.h 2013-11-12 22:11:57 +01:00
nesco
ce05498311 Sorting by Name on g_BlockTransparent 2013-11-12 22:08:33 +01:00
nesco
4d082d1190 BiomeFile, if not needed, will be removed 2013-11-12 22:03:48 +01:00
nesco
b6a9394d7a Update BlockID.cpp 2013-11-12 22:01:30 +01:00
nesco
5c67c17edc Corrected the comma error 2013-11-12 20:49:27 +01:00
nesco
56044aff33 Update BlockID.cpp 2013-11-12 19:26:35 +01:00
nesco
b7c1ed186a Update Enchantments.cpp 2013-11-12 19:15:48 +01:00
nesco
5c8017e629 Assigning properties to the blocks recently added. 2013-11-12 19:12:26 +01:00
nesco
8bdb963be4 Update BlockID.h 2013-11-12 18:54:56 +01:00
nesco
2026c8c2a6 Replace tabs by spaces 2013-11-12 18:53:53 +01:00
STRWarrior
1eb2b7e176 Now using a TickFollowPlayer function. 2013-11-12 16:39:59 +01:00
nesco
ca7b3c72ad Update BlockID.h 2013-11-12 14:47:34 +01:00
nesco
6cbf205b94 Update in progress to minecraft 1.7 2013-11-12 14:32:23 +01:00
nesco
047995ef25 Added the new enchantments of Minecraft 1.7 
-Luck of the sea
-Lure
 2013-11-12 13:41:39 +01:00
nesco
fd901e3d7c Added the new enchantments of Minecraft 1.7 
Added the following enchantments : 
Luck of the Sea : ID = 61
Lure : ID = 62
 2013-11-12 13:37:39 +01:00
madmaxoft
11c5ad1170 cWindow: Fixed item dupe glitch with painting (#278) 2013-11-12 13:15:09 +01:00
madmaxoft
8fa8107e45 Fixed dblclicking in crafting slot area. 
Fixes #229.
 2013-11-11 21:33:14 +01:00
Tiger Wang
f713780db3 Bundled fixes [SEE DESC] 
* Fixed compiler warning in Monster.cpp
* Future proofed particle effects
* Improved pickups, made less jittery
 2013-11-10 22:20:25 +00:00
madmaxoft
09e4f041dd Fixed cRoot::FindAndDoWithPlayer(). 
Now /kick and /ban work.
 2013-11-10 22:58:39 +01:00
madmaxoft
480ff3789b Protocol 1.7: Fixed crashes and d/c with bad packets. 
Fixes #332.
 2013-11-10 22:58:39 +01:00
Mattes D
3a692d53e8 Merge pull request #330 from tonibm19/patch-1 
Added sheep dyeing
 2013-11-10 13:04:27 -08:00
STRWarrior
165f68b8d9 Removed #include "../Root.h" since it isn't needed. 2013-11-10 21:59:38 +01:00
STRWarrior
1682c61b59 Removed #include "../Root.h" since it isn't needed. 2013-11-10 21:56:37 +01:00
madmaxoft
dadae874f2 Small code-style fixes. 2013-11-10 21:55:32 +01:00
Tiger Wang
71abbb2f56 Bundled fixes [SEE DESC] 
* Fixed pickups spawning in an incorrect position from a JukeBox
* Pickups make a popping sound in Prtcl1.7
* Arrows make a *what sort of sound does an arrow make anyway‽* when
hitting a block, and a popping sound when fired
* Mobs again have metadata
* Fixed Prtcl1.7 not using valid JSON to kick a client
* Minecarts and arrows again have metadata
 2013-11-10 20:48:12 +00:00
madmaxoft
dde491ee0e Merge branch 'master' into WolfUpdate 2013-11-10 21:42:56 +01:00
STRWarrior
2ccf9b2b32 Renamed variables in cWolf. 2013-11-10 21:24:36 +01:00
STRWarrior
e62858ec3d Using DoWithPlayer instead of FindAndDoWithPlayer for callbacks. 
You are able to dye the collar.
 2013-11-10 20:12:30 +01:00
madmaxoft
bd664e0a90 Implemented inventory dblclick. 
Implements #229.
 2013-11-10 18:42:46 +01:00
madmaxoft
fe07012952 Added cItem::GetMaxStackSize() 2013-11-10 18:41:26 +01:00
STRWarrior
4f11cd2f8a The owner object isn't stored anymore. Instead we use the name of the player. 
This means only players can now have a wolf, but it fixes the bug where when you log out the wolf isn't your wolf anymore.
 2013-11-10 18:03:19 +01:00
tonibm19
4af5868322 Fixes (SEE DESC) 
Entity metadata is broadcasted.
If player is in survival, his equipped item is removed.
If you have green dye, and sheep is green, your equipped item won't be removed.
 2013-11-10 17:05:19 +01:00
tonibm19
da5bd81836 STR_Warrior was right. 
Simplified code.
 2013-11-10 16:48:22 +01:00
tonibm19
e2b4745bbf Fixed compilation 2013-11-10 16:43:47 +01:00
tonibm19
9da4011a7f You can no longer color with wood 2013-11-10 16:42:38 +01:00
tonibm19
e919496025 Added sheep dyeing 2013-11-10 16:03:00 +01:00
STRWarrior
0980567912 Using cMonster::Tick instead of super::cMonster::Tick 2013-11-10 15:51:32 +01:00
STRWarrior
38f6fff3fb Wolves can now be owned by an entity. 
They only sit when right clicked by their owner.
They beg if the closest player has meat or bones in his hand.
They follow their owner.
They teleport to their owner if they are more then 30 blocks away.
They don't attack players if they are not angry anymore.
They don't move if they are sitting.
 2013-11-10 15:16:43 +01:00
madmaxoft
fb3a175b28 Protocol 1.7: Attempt at fixing SoundParticleEffect packet. 2013-11-10 14:19:02 +01:00
madmaxoft
3fd7124435 Fixed Player animation packet. 
Fixes #329.
 2013-11-10 13:40:38 +01:00
madmaxoft
b6ca98f380 Removed cStringMap. 
It wasn't used for anything anymore.
 2013-11-09 19:54:52 +01:00
madmaxoft
73cd2216a7 Fixed cTracer's tolua markup. 
Cleaned up unneeded member variables.
 2013-11-09 19:49:36 +01:00
madmaxoft
404034d230 Fixed sprinting in 1.7 protocol. 
Fixes #324
 2013-11-08 22:40:31 +01:00
madmaxoft
efbc4a9b78 Declaring 1.7.2 compatibility. 2013-11-08 22:09:39 +01:00
madmaxoft
24428a9768 MobSpawner: Added skeleton and wolf conditions. 
This fixes the flood of warnings in the server console in Debug mode.
 2013-11-08 22:06:08 +01:00
madmaxoft
07fa8313b1 cProtocol::SendWindowOpen() signature changed. 
This implements #313.
 2013-11-08 21:32:14 +01:00
madmaxoft
b24bdff308 Fixed code style. 2013-11-08 21:06:31 +01:00
madmaxoft
4707784929 Protocol 1.7: Fixed using entities. 
The mouse buttons were swapped.
 2013-11-08 21:03:51 +01:00
madmaxoft
64412c1fe3 Protocol 1.7: Copied Mob Metadata code from 1.2.5. 2013-11-08 20:56:19 +01:00
Mattes D
d33112b6b1 Merge pull request #321 from mc-server/1.7pickupsfix 
Fix for entity spawning in general
 2013-11-08 08:41:46 -08:00
tonibm19
705e6c1301 Changed variable name 2013-11-08 17:16:36 +01:00
tonibm19
2cf93b8e25 Changed variable name 2013-11-08 17:15:28 +01:00