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

2120 Commits

Author SHA1 Message Date
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
tonibm19
20d9886847 Now chicken drop eggs 2013-11-08 14:04:41 +01:00
tonibm19
4d7695549a Now chickens can drop eggs. 
They drop an egg every 5 or 10 minutes.
 2013-11-08 14:04:00 +01:00
Tiger Wang
41451100c1 Added hardcore client effect 
Also fixed multiple world comments issue.
 2013-11-07 22:33:46 +00:00
Tiger Wang
21d835b594 Fix for entity spawning in general 2013-11-07 20:58:47 +00:00
Tiger Wang
4722a90a0b Possible fix for 1.7 pickup spawning 2013-11-07 18:49:48 +00:00
madmaxoft
034a283a28 Protocol 1.7: Fixed the Spawn Mob packet. 
This should fix #318
 2013-11-07 17:11:36 +01:00
madmaxoft
088f7f68fc Protocol 1.7: Added the remaining server-bound packets. 2013-11-06 22:27:09 +01:00
madmaxoft
edc848439a Protocol 1.7: Added more server-bound packets. 2013-11-06 20:48:56 +01:00
madmaxoft
cc54f4f836 Protocol 1.7: Finished the client-bound packets. 2013-11-06 20:48:56 +01:00
madmaxoft
c3caa66b70 Made the cDeadlockDetect class work in clang. 2013-11-06 20:48:55 +01:00
Mattes D
f0a2d49aca Merge pull request #312 from SamJBarney/master 
Flowers, mushrooms and air are no longer collidable.
 2013-11-05 13:35:21 -08:00
Mattes D
12eeb3f6c8 Merge pull request #309 from mc-server/configautogen 
Autogeneration of settings.ini and webadmin.ini
 2013-11-05 13:24:23 -08:00
Samuel Barney
e6ace0e4f2 More documentation. 2013-11-05 14:19:49 -07:00
madmaxoft
6bd30954c5 Clarified cBlockHandler::ConvertToPickups() dox. 2013-11-05 22:19:46 +01:00
Tiger Wang
a263dc8e83 Implemented suggestions 
- Reverted changes to WebAdmin.cpp IPv6 ports and Server.cpp server
description
+ Added default value explicitly for HardCore value
* Split PluginManager plugin defaults write to new function
- Removed a commented block from BlockTorch and...
+ Added g_BlockIsTorchPlaceable to Defines.h
 2013-11-05 21:15:39 +00:00
Samuel Barney
5d353fd8f8 Added missing check for a_LineOfSight 2013-11-05 14:13:12 -07:00
Samuel Barney
eefc6d37ef cTracer can now handle mob sight. 2013-11-05 14:11:13 -07:00
Samuel Barney
9d5d74d826 Added more documentation. Changed cTracer::Trace to return a bool instead of an int because it was only returning 1 or 0 anyways. 2013-11-05 14:01:51 -07:00
madmaxoft
e2e948015e Protocol 1.7: More client-bound packets. 
Also removed the SendWholeInventory(cInventory &) function, as promised in prev commit.
 2013-11-05 18:37:57 +01:00
madmaxoft
88472b7ce6 Removed the obsolete SendWholeInventory(cInventory &) function. 
This won't compile because there's still a change in Protocol17x.cpp pending; the next commit will fix this.
 2013-11-05 18:37:57 +01:00
Mattes D
e65ce13012 Merge pull request #307 from mc-server/MobImprovements 
Mob projectiles
 2013-11-05 08:22:31 -08:00
Samuel Barney
e37531fe01 Moved cTracer::SetValues to be an internal function because it is only ever used in cTracer::Trace. 
Removed SetValues from Bindings.cpp.
Added some commenting to explain what each function does in cTracer.
 2013-11-05 09:22:28 -07:00
STRWarrior
c84bd79eff Fixed indentation. 2013-11-05 16:24:54 +01:00
Samuel Barney
b23047f47b Reworked collision to use g_BlockIsSolid 2013-11-04 20:10:29 -07:00
Samuel Barney
96ef6084ae Flowers, mushrooms and air are no longer collidable. 2013-11-04 17:14:49 -07:00
Tiger Wang
0c2c803a16 Removed settings/webadmin.example.ini files 
Additionally, added some default plugins to autogeneration. Also moved
nbt examples to docs/NBT Examples.
 2013-11-04 22:06:23 +00:00
Tiger Wang
e832736e0b Autogeneration of settings.ini and webadmin.ini 
Fixes issue #75
 2013-11-04 21:51:24 +00:00
STRWarrior
7cfcfc5f39 Skeleton, Ghast and Blaze's projectile code is now in their respective class. 2013-11-04 21:46:56 +01:00
madmaxoft
d47a8ea008 Protocol 1.7: Added more client-bound packets. 
Untested, still more to come.
 2013-11-04 21:20:36 +01:00
madmaxoft
3002dc8bbf Protocol 1.7: Added client status packet. 2013-11-03 21:34:46 +01:00
Mattes D
7c60ad4856 Merge pull request #306 from tigerw/master 
Flipped some variables in Portals
 2013-11-03 09:06:15 -08:00
madmaxoft
9b84d68d27 Protocol 1.7: Rewritten packet-sending to use cPacketizer. 
Implemented enough of the protocol that the client now spawns in the world (but cannot do anything).
 2013-11-03 11:59:07 +01:00
madmaxoft
dacd6a5274 cByteBuffer: Fixed GetUsedSpace() off-by-one error. 2013-11-03 11:59:07 +01:00
madmaxoft
53c31ee1cd ClientHandle: Fixed an error in player-joining hook. 
Players being disconnected used to fire the PlayerJoined hook repeatedly.
 2013-11-03 11:59:07 +01:00
madmaxoft
9bdc94053e Added cEntity:GetYaw() and cEntity:SetYaw(). 
This is the preferred way to get / set rotation, GetRotation() and SetRotation is obsoleted due to bad name.
 2013-11-03 11:59:05 +01:00
madmaxoft
7dc96f0441 Added cPlayer::GetEffectiveGameMode(). 2013-11-03 11:59:05 +01:00
STRWarrior
6f0f620cf8 Skeleton.cpp doesn't have to load ProjectileEntity.h and Entity.h. 2013-11-02 21:32:55 +01:00
STRWarrior
58ced0c12c Skeletons, Blazes and Ghasts now shoot their projectile to the target. 2013-11-02 20:47:43 +01:00
STRWarrior
3dc3e5eca7 Zombies and Skeletons don't walk into the sun anymore. 2013-11-02 20:45:51 +01:00
Tiger Wang
5bd9eb6a1f Flipped some variables in Portals 
To make them work on the X axis.
 2013-11-02 19:04:38 +00:00
Mattes D
56c97d6c30 Merge pull request #303 from tigerw/bugfixes 
Nether portal creation
 2013-11-02 09:10:18 -07:00
Tiger Wang
f38375a2ec Fixed bow damage in creative 
Also reverted indenting change
 2013-11-02 16:01:40 +00:00
Tiger Wang
96cd7d65a3 Fixed dropspensing speed and position 2013-11-02 14:09:07 +00:00
Tiger Wang
77b3db7e25 Multiple fixes 
* Fixed #282
* Fixed bow not taking damage
* Enhanced Player.cpp code
 2013-11-02 14:08:00 +00:00
Tiger Wang
b731dd0635 Split border finder into separate function 2013-11-02 13:50:30 +00:00
Tiger Wang
585f01c3f6 Implement suggestions 
- Removed unneeded parameter
* Changed 0 -  1 to -1
 2013-11-02 12:29:26 +00:00
Tiger Wang
72ec10f26d Readded BlockPortal.h (portals) 2013-11-02 00:50:03 +00:00
Tiger Wang
7913a2dcdb Fixed compile error (portals) 
WITH A FULL REFORK
 2013-11-02 00:44:09 +00:00
madmaxoft
b6faeaba18 Protocol 1.7: Implemented the first batch of sent packets. 2013-11-01 16:20:15 +01:00
madmaxoft
db190a627c Merge branch 'master' of https://github.com/mc-server/MCServer 2013-11-01 11:17:37 +01:00
madmaxoft
62d27e4ed9 Merge branch 'griefer'sdelight' of git://github.com/tigerw/MCServer. 2013-11-01 11:14:55 +01:00
madmaxoft
7a77986d88 Protocol 1.7: Added skeleton functions for reading client packets. 
Untested, this is skeleton code only.
 2013-10-31 23:48:43 +01:00
madmaxoft
080ee3b2a1 ByteBuffer: Writing a string doesn't modify it (missing const). 2013-10-31 23:47:22 +01:00
Mattes D
4124ed3ef9 Merge pull request #302 from SamJBarney/master 
Broken rail blocks now stack.
 2013-10-31 05:58:02 -07:00
Samuel Barney
d85a2a1c2f Adhering to project standards. 2013-10-31 06:19:06 -06:00
Samuel Barney
47697b2667 Added missing conventions for windows. 2013-10-30 19:09:12 -06:00
Samuel Barney
e2ef23fa5f Broken rail blocks now stack. 2013-10-30 16:58:18 -06:00
madmaxoft
feaea31b78 Protocol 1.7: Added status ping handling. 2013-10-30 23:38:55 +01:00
madmaxoft
f490d3d1e7 Fixed a compiler warning. 
Also updated code to match our style.
 2013-10-30 23:33:42 +01:00
Mattes D
8b9d3c7722 Merge pull request #292 from SamJBarney/MobSpawning 
Mob Spawning based on light values
 2013-10-30 15:25:51 -07:00
madmaxoft
dab398d5d6 Added 1.7 to protocol recognizer. 
The 1.7 protocol currently only reports server description and playercount.
 2013-10-30 23:24:46 +01:00
Samuel Barney
7157c392fa Last of the nitpicker note fixes. Added some inline commenting. 2013-10-30 16:14:42 -06:00
Mattes D
9497e11ad4 Merge pull request #301 from SamJBarney/master 
Grass no longer grows under water, and water on top kills it.
 2013-10-29 14:32:31 -07:00
Mattes D
a0c2981a3c Merge pull request #299 from tonibm19/master 
Saddles are dropped, chicken spawn out of thrown eggs.
 2013-10-29 14:03:49 -07:00
Samuel Barney
f2e17981c5 Grass no longer grows under water, and water on top kills it. 2013-10-29 14:49:15 -06:00
STRWarrior
52d956ccf3 Changed GameMode() == 1 to IsGameModeCreative in AggressiveMonster.cpp and ClientHandle.cpp 2013-10-29 21:45:31 +01:00
STRWarrior
0384c54676 Fixed bug where creative inventory didn't work. 2013-10-29 21:19:06 +01:00
Samuel Barney
e94307c292 Changes based on madmaxoft's nitpicker notes. 2013-10-29 12:43:41 -06:00
Samuel Barney
e1a06153b2 Update to allow the light map to remain the same, but allow alteration of sky light values based on time. 2013-10-29 10:44:51 -06:00
tonibm19
e96c1aebfe Using tabs 2013-10-29 16:44:45 +01:00
Samuel Barney
d7a490a992 Merge branch 'master' of https://github.com/SamJBarney/MCServer into MobSpawning 2013-10-28 16:40:13 -06:00
Samuel Barney
47283f9daa Got spiders and other mobs respecting night and day for spawning 2013-10-28 16:38:34 -06:00
tonibm19
8a6511d329 fixed indentation 2013-10-28 21:45:49 +01:00
tonibm19
b26acdb9db extra line 2013-10-28 21:41:43 +01:00
tonibm19
669beef2de attempt at fixing indentation 2013-10-28 21:37:45 +01:00
tonibm19
b182f25324 Extra line 2013-10-28 21:00:14 +01:00
tonibm19
1841d77952 Fixed indentation 2013-10-28 20:58:50 +01:00
tonibm19
8c9fa9cf35 Added random chicken spawn when throwing an egg 2013-10-28 20:57:04 +01:00
madmaxoft
dfefdcf7f1 MC uses VarInts only up to 32-bits. 2013-10-28 20:57:03 +01:00
madmaxoft
c9b6c3bc2e cByteBuffer: Added the VarInt and VarUTF8String type reading and writing. 
This implements #296.
 2013-10-28 20:40:55 +01:00
tonibm19
1ff051c9a3 Now saddled horses spawn a saddle pickup when killed 2013-10-28 20:28:16 +01:00
tonibm19
5a723454a9 Now saddle pigs spawn a saddle pickup when killed 2013-10-28 20:27:05 +01:00
madmaxoft
1eac38f3d7 Fixed indentation in tonibm19's code. 2013-10-28 19:54:03 +01:00
Mattes D
65b43604a5 Merge pull request #294 from tonibm19/patch-3 
Correct wool drops when shearing a sheep.
 2013-10-28 11:51:46 -07:00
tonibm19
984277f65e Fixed compilation 
STR_Warrior code had an error (I copied&pasted it before)
 2013-10-28 19:47:38 +01:00