1
0
Commit Graph

1770 Commits

Author SHA1 Message Date
Tiger Wang
57dfdd3205 Implemented xoft's suggestions 2013-09-19 21:21:56 +01:00
Tiger Wang
ecf40e2893 Fixed new monster aggressiveness issue 2013-09-19 21:20:21 +01:00
madmaxoft
f08d78c887 Fixed rounding errors in cProtocol125::SendExplosion().
This should fix #129.
2013-09-19 22:03:02 +02:00
madmaxoft
18d795d8da Fixed a crash in cEntity when the entity was at BlockY == 0. 2013-09-19 21:35:58 +02:00
madmaxoft
111fd58914 Added support for 1.6.3 and 1.6.4 protocols.
No relevant changes have been detected, using the 1.6.2 protocol handler.
2013-09-19 20:49:09 +02:00
Tiger Wang
198ac1892c Fixed pickups 2013-09-18 22:20:08 +01:00
Tiger Wang
3e698d7b72 Added moar mobs!
+ Added dragons
+ Added golems
+ Added giants
+ Added horses
+ Added some missing items
+ Added missing spawn egg metas
2013-09-18 22:17:43 +01:00
madmaxoft
47ef25ce77 Added a global "g_Plugin" object to all Lua plugins.
This allows plugins to have an empty Initialize function and implementing all their initialization at global level, thus modularising everything.
2013-09-18 22:31:44 +02:00
madmaxoft
a2d5f86769 Improved error message in cPlugin:AddWebTab() API. 2013-09-18 22:30:36 +02:00
madmaxoft
66da02519a Added cPlugin:GetLocalFolder() API function.
This supersedes the cPlugin:GetLocalDirectory() function.
2013-09-18 22:15:12 +02:00
madmaxoft
edd7363edd Proper folder / file distinction in plugin loading. 2013-09-18 20:40:09 +02:00
madmaxoft
403e0d5be4 cPluginManager:BindConsoleCommand can be called with the dot operator, too. 2013-09-18 20:40:09 +02:00
madmaxoft
b66031de65 cPluginManager:BindCommand can be called with the dot operator, too. 2013-09-18 20:40:09 +02:00
Tiger Wang
846f1223f4 Implemented redstone comparators
They can be placed and toggled, but stills needs proper redstone support
2013-09-18 18:27:21 +01:00
Mattes D
aa2edeae77 Merge pull request #176 from tigerw/bugfixes
Fixed repeater and wood placement
2013-09-17 23:09:35 -07:00
Tiger Wang
480991d1ac Multiple fixes [SEE DESC]
- Removed two random block handling files in the item handling section
that didn't do anything. (One was an attempt at making slabs work, but
failed to realise that the coords would have to be the block CLICKED,
and another was just a random empty file for handling wooden planks.)
* Fixed placing repeater blocks not directioning properly
* Fixed wood directions breaking plank metadata
2013-09-18 00:01:20 +01:00
Mattes D
4c1f1cc539 Merge pull request #175 from tigerw/bugfixes
Bugfixes
2013-09-17 13:57:14 -07:00
Tiger Wang
ab696c37c3 Snow now supports meta values
Fixes #98
2013-09-17 21:22:26 +01:00
Tiger Wang
a3a3a6ebe6 Added wood directions
+ Added wood directions
2013-09-17 20:59:36 +01:00
Tiger Wang
f2b7b220a4 Fixed undead burning
(c'mon xoft, test ya code :P)
2013-09-17 20:57:35 +01:00
Alexander Harkness
59cf62f268 Merge pull request #172 from tigerw/bugfixes
Fixes to torches and entities - because they were derpy zubzubs.
2013-09-17 02:28:09 -07:00
Tiger Wang
efe520727d Fixed derpy comparison 2013-09-16 21:07:25 +01:00
Tiger Wang
9711fd7970 Fixed friction for entities
Due to a misplaced else, other entities weren't getting friction
2013-09-16 19:19:25 +01:00
Tiger Wang
506a693339 Torch fixes [SEE DESC]
* Torches snap to neighbour when placed on bottom
* CanBeAt takes into account cobblestone walls
+ Used more BLOCK_FACEs instead of numbers
2013-09-16 19:18:36 +01:00
Alexander Harkness
e875bbe2e6 Fixed missing newline. 2013-09-16 19:16:05 +01:00
tonibm19
f215402c6c Vanilla like maximum and default view distance 2013-09-16 20:07:33 +02:00
Matyas Dolak
7e0f56ccce Attempt at fixing linux crash on player login.
Ref.: http://forum.mc-server.org/showthread.php?tid=1244
2013-09-16 15:23:16 +02:00
madmaxoft
9f7b2e259d Exported cMonster:GetMobType() to the Lua API. 2013-09-16 11:42:20 +02:00
madmaxoft
79851476d2 Removed cWorld:SaveAllChunks() from the API.
Use cWorld:QueueSaveAllChunks() instead, the old function was prone to deadlocks.
2013-09-16 10:15:25 +02:00
madmaxoft
40d295da26 cWorld:QueueTickBlock takes the delay in ticks. 2013-09-16 09:25:23 +02:00
madmaxoft
a6b3c560a2 Fixed doxycomments of cWorld plant-growing code 2013-09-15 22:11:02 +02:00
madmaxoft
4aa14c0264 Fixed previous commit 2013-09-15 22:09:45 +02:00
madmaxoft
530f6f2b71 Removed cWorld deprecated API: SetWorldTime() 2013-09-15 21:55:24 +02:00
madmaxoft
5514a6169f Removed obsoleted cWorld functions from the API:
GetClassStatic() (is used only internally by ManualBindings)
GetTime() (is replaced with GetWorldAge() and GetTimeOfDay()
2013-09-15 21:53:36 +02:00
madmaxoft
5d2d0fe109 Fixed previous commit. 2013-09-15 21:52:25 +02:00
madmaxoft
f8947ce18e Fixed API bindings of cWorld:GetSignLines(), exported cWorld:UseBlockEntity(). 2013-09-15 21:47:56 +02:00
madmaxoft
a7ad5715f9 Fixed tigerw's leftovers. 2013-09-15 20:59:05 +02:00
madmaxoft
b34e92571a Updated the bindings again. 2013-09-15 20:52:25 +02:00
madmaxoft
5cde7d8a29 Merge branch 'pickups' of git://github.com/tigerw/MCServer into tigerw-pickups
Conflicts:
	source/BlockID.cpp
	source/Entities/Entity.cpp
2013-09-15 20:49:08 +02:00
madmaxoft
4e200df18c Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixes
Conflicts:
	source/Blocks/BlockTorch.h
2013-09-15 20:34:22 +02:00
madmaxoft
9a35c1c150 Fixed cWorld bindings for GetBlockInfo() and GetBlockTypeMeta().
They no longer require the superficial arguments.
2013-09-15 20:29:20 +02:00
Tiger Wang
91a13c8e87 Fixed pistons pulling un-pullables 2013-09-15 16:40:09 +01:00
Tiger Wang
30b8300ad3 Mycelium now has correct placement sound 2013-09-15 15:56:02 +01:00
Tiger Wang
fc3d5ff5a6 Torches work properly
Also fixed a naming inconsistency concerning quartz stairs.
2013-09-15 15:55:35 +01:00
Tiger Wang
a8cb2bd90e Removed leftover CanBePlacedOnSide 2013-09-15 12:20:13 +01:00
Tiger Wang
411f0b5fa4 Removed leftover DoesAllowBlockOnTop 2013-09-15 12:18:14 +01:00
Tiger Wang
11bbfbc98a Added break 2013-09-15 12:15:27 +01:00
madmaxoft
37b3b5defb Updated the automatic bindings. 2013-09-15 00:14:03 +02:00
madmaxoft
a1c5ad0594 Set the minimum viewdistance to 3.
Fixes #167.
2013-09-14 21:34:26 +02:00
madmaxoft
2973b17977 Fixed empty-handed itemhandler.
This should fix FS 430.
2013-09-14 08:16:56 +02:00
Tiger Wang
4cdf776759 Removed torch top placement prevention 2013-09-13 21:08:36 +01:00
Tiger Wang
1cbb38fb02 Removed place on top and side preventions 2013-09-13 20:17:39 +01:00
Tiger Wang
47119b3027 Even better pickup physics 2013-09-13 19:54:50 +01:00
tonibm19
973753774e Added an extra line.
In first commit it says I removed first line
2013-09-13 20:06:42 +02:00
tonibm19
b703d9c83b Fixed mobs attack range being too long
It was set to 5, I think 2 is better because now mobs can kill you when there is a block (or 2) between you and monster.
2013-09-13 19:33:22 +02:00
Tiger Wang
22b8f3a2e0 Even more fixes [SEE DESC]
* Fixed minecarts breaking completely due to stuff
* Rails are now non solid again
+ Added IsRail inline bool
- Removed Herobrine
2013-09-12 23:57:02 +01:00
Tiger Wang
a39564a46a Fixed water speed issues 2013-09-12 23:31:26 +01:00
Tiger Wang
8163ca9549 Implemented xoft's suggestions again 2013-09-12 10:25:13 +01:00
Tiger Wang
a1d5d25525 Implemented xoft's suggestions
I totally didn't copy this from the fire simulator...

(I did, but I changed it quite a bit :P)
2013-09-11 22:10:29 +01:00
madmaxoft
791ced42cc Added StringSplitAndTrim() to Lua API 2013-09-11 21:22:25 +02:00
Mattes D
85804d085d Merge pull request #159 from tigerw/bugfix
Multiple fixes and features
2013-09-11 12:19:39 -07:00
Tiger Wang
3a1def2c90 More changes [SEE DESC]
* Improved (again) pumpkin direction handling
* Fixed spacing in Entity.cpp
2013-09-11 20:07:51 +01:00
Tiger Wang
8ef91817e9 Pumpkins 2013-09-11 19:02:09 +01:00
Tiger Wang
e9321bc715 Better player gamemode detection 2013-09-11 18:56:03 +01:00
Tiger Wang
277b26b4c2 Fixed two bugs 2013-09-11 18:51:27 +01:00
worktycho
37e0e684f4 moved reflection code to PlayerYawToMetadata 2013-09-11 17:07:54 +01:00
worktycho
3236364eee changed the subtaraction to a flip 2013-09-11 13:48:08 +01:00
Tiger Wang
cb167f78e3 Added player void damage 2013-09-10 23:02:35 +01:00
Tiger Wang
c8f8597774 Added void damage 2013-09-10 23:01:02 +01:00
Tiger Wang
010bc94a34 Entities now maintain speed outside of world 2013-09-10 22:51:07 +01:00
Tiger Wang
3d7813fdb2 Pumpkin and JackOLantern support
Fixes #99
2013-09-10 22:09:31 +01:00
madmaxoft
6dbe3296e0 Fixed codepage conversion 2013-09-10 22:03:11 +02:00
Tiger Wang
e0c649dcc4 Fixed DropSpensers not rotating properly 2013-09-09 19:36:53 +01:00
Tiger Wang
30ac3f5838 Added a few changes [SEE DESC]
* Revised pickup comments
* SlotArea pickup tossing now reflects Player.cpp
* Removed unneeded ItemShears comment (was working already)
* Sand and gravel pickups spawn with correct speed
2013-09-09 19:28:50 +01:00
Tiger Wang
57c17a02db A few Minecart fixes
* Removed unneeded flatrail setpos
* Fixed health checking
2013-09-09 18:55:42 +01:00
madmaxoft
becb36d2d1 Fixed a crash on immediate re-login.
Fixes #155.
2013-09-09 18:34:38 +02:00
madmaxoft
5945166a98 Merge branch 'boats' of git://github.com/tigerw/MCServer. 2013-09-09 11:13:14 +02:00
madmaxoft
b8d2d94d90 Removed the cDoors class.
The helper functions that it implemented were moved into their respective blockhandlers.
2013-09-09 10:49:52 +02:00
madmaxoft
db6cfefadd Removed the "charging bow" debug message. 2013-09-08 22:43:21 +02:00
madmaxoft
641a1286c1 Fixed torch placement.
This is related to #127, but until we know more about the change, I'm not closing the issue.
2013-09-08 22:40:50 +02:00
madmaxoft
ab61b4193b Alpha-sorted g_BlockIsSnowable[]. 2013-09-08 18:39:35 +02:00
madmaxoft
2071fb6491 Thrown ender pearls are saved properly to MCA. 2013-09-08 18:37:35 +02:00
madmaxoft
b9066ab8f9 Fixed client spawning.
The method used for 1.2.5 clients no longer works. Fixes #139.
2013-09-08 18:37:35 +02:00
STRWarrior
7862a76684 Re-added the top line. 2013-09-08 18:35:48 +02:00
STRWarrior
00a25016b3 Added E_BLOCK_LILY_PAD to g_BlockIsSnowable. 2013-09-08 18:33:53 +02:00
madmaxoft
6c0c1f1d0c Implemented proper chunk unloading in all 1.3.2+ clients 2013-09-08 17:57:50 +02:00
Tiger Wang
50e24fb75f Fixed a bunch of stuff
* Fixed compilation
* Made it less obvious I COPIED ALL THE CODE from Minecarts
* Fixed alignment spaces to make xoft happy
2013-09-08 16:56:16 +01:00
Tiger Wang
c789a8ddf5 Initial boat support
+ Boats are saved
+ Boats have physics
+ Boats spawn
2013-09-08 00:14:57 +01:00
Tiger Wang
35efe9c727 Fixed formatting and removed gravity thing 2013-09-07 21:42:33 +01:00
madmaxoft
d31142811d Merged branch 'Projectiles'. 2013-09-07 22:06:30 +02:00
madmaxoft
d1b68f6150 Added a (disabled) block logging to projectile path-tracing. 2013-09-07 21:56:22 +02:00
madmaxoft
d6c4447022 Updated the API bindings. 2013-09-07 21:26:50 +02:00
madmaxoft
7938f18c57 Implemented loading more projectiles from MCA. 2013-09-07 21:26:17 +02:00
madmaxoft
06b01af017 Implemented ghast fireball and firecharge projectiles 2013-09-07 18:53:14 +02:00
madmaxoft
3b1c83acf8 Renamed cWorld::DoExplosiontAt() to cWorld::DoExplosionAt() 2013-09-07 18:12:22 +02:00
madmaxoft
3f4718154b Arrows have proper yaw and pitch when shot, and stop when they hit a block. 2013-09-07 17:14:37 +02:00
madmaxoft
5f8a46373d Fixed a missing initialization in cMonster.
This should fix commit ff762a7ece 's all-mobs burning.
2013-09-07 16:42:34 +02:00
madmaxoft
f300ed54e5 Implemented SteerVehicle packet. 2013-09-06 16:50:21 +01:00
madmaxoft
e8d1ed36c5 Moved daylight burning directly into cMonster. 2013-09-06 16:50:20 +01:00
madmaxoft
a80be25c92 Removed TimedWait from cEvent.
Unsupported on MacOS.
2013-09-06 16:50:18 +01:00
madmaxoft
67e8f75318 Implemented SteerVehicle packet. 2013-09-06 00:04:49 +02:00
Tiger Wang
178b5884fc Further physics improvements [SEE DESC]
This was mainly focused on pickups, but it works for other things too.

* Entities no longer clip through blocks positive-vertically (this fixes
pickup issues as well).
* Entities lie flat against a block when they hit it.
* Reduced entity (mainly pickup) block clipping in non vertical
directions.
2013-09-05 21:41:47 +01:00
madmaxoft
ff762a7ece Moved daylight burning directly into cMonster. 2013-09-05 22:40:08 +02:00
madmaxoft
cdaa483778 Merge branch 'master' of git://github.com/tigerw/MCServer into tigerw-master 2013-09-05 17:44:22 +02:00
madmaxoft
6ff49ec3a8 Removed TimedWait from cEvent.
Unsupported on MacOS.
2013-09-05 15:22:16 +02:00
madmaxoft
5c0039e7b0 Removed an unused include 2013-09-04 22:02:04 +02:00
Tiger Wang
ad89a0d460 Pickups spawn with correct speed and position
Added a comment-space as well.
2013-09-04 18:26:00 +01:00
Tiger Wang
6059c44dcb Players toss a little further 2013-09-04 18:15:20 +01:00
Tiger Wang
fd35f6d707 Pickups are a little less jittery
They also spawn closer to player mouth.
2013-09-04 18:13:46 +01:00
Tiger Wang
3300cfe491 Added better push out of entities 2013-09-04 17:52:15 +01:00
Tiger Wang
9c22cf1520 Fixed inconsistent meta naming 2013-09-03 12:33:54 +01:00
madmaxoft
4c24781a62 Added cEntity's gravity to the Lua API. 2013-09-03 10:20:56 +02:00
madmaxoft
2c5e566fe7 Implemented exact block hit position.
Arrows now stick out of blocks at the exact position where they hit.
2013-09-03 09:41:31 +02:00
madmaxoft
f7d5894427 Added cArrowEntity's criticalness to the API. 2013-09-03 08:39:35 +02:00
madmaxoft
3a921955d9 Arrows deal damage based on their speed. 2013-09-03 08:37:15 +02:00
madmaxoft
e8b77ea2f5 Projectiles slow down in water and lava. 2013-09-02 21:56:55 +02:00
madmaxoft
7433b3723c Projectiles don't collide with their creators. 2013-09-02 21:40:56 +02:00
madmaxoft
f5e0c8c77e cBoundingBox: Only forward collisions are calculated. 2013-09-02 19:51:13 +02:00
Tiger Wang
20b64e18e4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	source/Bindings.cpp
	source/Entities/Entity.cpp

Updated from upsteam
2013-09-02 14:15:28 +01:00
Tiger Wang
b5c63d8fc5 Minecart enhancements [SEE DESC]
Curved rails.
Better physics.
Better code as improved by xoft.
Stuff.
2013-09-02 12:01:49 +01:00
madmaxoft
a884fbb919 Arrows deal damage.
Still needs some tweaks, they hit the shooter most of the time.
2013-09-01 22:40:35 +02:00
madmaxoft
4f04724cfd Made cBoundingBox class inclusive in both coord edges.
Also added (a disabled) self-test to cBoundingBox.
2013-09-01 22:38:09 +02:00
madmaxoft
e35402c61a Fixed an error in cBoundingBox's line-collision algorithm. 2013-09-01 20:39:22 +02:00
madmaxoft
0dec48d496 Added dtRangedAttack, fixed faulty StringTODamageType() 2013-09-01 20:06:49 +02:00
madmaxoft
5fccd67bad Added line collision calculation to cBoundingBox. 2013-09-01 19:08:51 +02:00
madmaxoft
b12d2edb4e Renamed BLOCK_FACE constants to use the new coord-wise names.
The old names are still present, but deprecated.
2013-09-01 19:05:58 +02:00
STRWarrior
2765fce522 Exported BroadcastSoundEffect and BroadcastSoundParticleEffect to the Lua API 2013-09-01 05:53:11 -07:00
madmaxoft
f91ff9e68b Added the cBoundingBox class. 2013-09-01 12:25:53 +02:00
madmaxoft
42ea85786a Thrown ender pearls now teleport and hurt. 2013-08-30 23:48:03 +02:00
madmaxoft
d7a5287000 Basic support for thrown items - eggs, snowballs and ender pearls.
They can be thrown, but they don't do anything on impact. Also they don't save to nor load from  MCA.
2013-08-30 18:10:58 +02:00
madmaxoft
88f3fe7f00 Moved throw pos and speed calculation from cProjectileEntity into cPlayer. 2013-08-30 17:29:46 +02:00
madmaxoft
c28ccdc9d5 Merged in the Projectiles branch.
Although the projectiles are not yet finished, the branch has several bugfixes that are needed in master as well.
2013-08-30 14:32:07 +02:00
madmaxoft
17ad4c2610 Shooting a bow kinda works.
The arrow is released, but sometimes hits wrong blocks or disappears completely.
2013-08-30 14:24:03 +02:00
madmaxoft
86eb71868b Rewritten cTimer not to use heap allocation. 2013-08-30 10:06:41 +02:00
Tiger Wang
acaae7a11e Physics enhancements
Minecarts no longer glitch on flat rails
Improved acceleration, speed limit, and stopping
2013-08-29 15:25:12 +01:00
Tiger Wang
9f59b9a093 Corrected comment TypeType 2013-08-29 14:00:39 +01:00
Tiger Wang
7056992d0d Implemented xoft's suggestions [SEE DESC]
Rail metas are  now in BlockID and exported to LUA
Minecart now does a SetMass, instead of m_Mass
Minecarts use SubType instead of TypeType
2013-08-29 13:47:22 +01:00
Tiger Wang
1e91002229 Fixed Minecart spawning issues
Now you can have everything!
2013-08-28 22:13:27 +01:00
Tiger Wang
fa7def847b Zomb-ee and Skellingtons burning improvements
They don't burn unless they are in direct view of the sun god or are
protected by the sands of the souls of the underworld.
2013-08-27 21:11:00 +01:00
Tiger Wang
f1f86c46d3 Preliminary Minecart physics handling [SEE DESC]
This commit includes physics handling for the following scenarios:

Flat rails in orientations [N, S, W, E]
Ascending/descending rails in orientations [N, S, W, E]

Powered rails are NOT handled (they don't respond to redstone).
Curved rails are NOT handled (I haven't figured out how to do them :P)

Please note that I have not tried to emulate vanilla behaviour because
of a lack of knowledge on velocity unites/C++. We can say it's a feature
or something. :P
2013-08-27 20:38:11 +01:00
madmaxoft
6677a5e8ca Implemented basic physics for projectiles. 2013-08-27 19:57:37 +02:00
madmaxoft
f260e9211f Entities fall 3x slower in water 2013-08-27 19:56:54 +02:00
madmaxoft
cdd0eba1b5 Added g_BlockIsXXX[] arrays to the API. 2013-08-27 08:57:35 +02:00
madmaxoft
49d69a0228 Debug logging for arrows improved 2013-08-26 22:40:30 +02:00
madmaxoft
71cfb8fcd2 Debug: arrow log their position in each tick 2013-08-26 22:27:28 +02:00
madmaxoft
ebc076e8b2 Fixed ProtoProxy compilation, added client Kick handling. 2013-08-25 21:57:12 +02:00
madmaxoft
4bbade9fc6 Arrows get loaded from MCA.
Somehow they still don't spawn visibly on the client.
2013-08-25 21:32:17 +02:00
madmaxoft
da3e248632 Added a few API accessors to cArrowEntity. 2013-08-25 21:31:35 +02:00
madmaxoft
a7447b4c7e Moved entity spawning into cEntity::Initialize().
It has been called in every descendant anyway, so it's better this way - reduced duplicate code.
2013-08-25 21:25:13 +02:00
madmaxoft
83811b6929 Merged branch 'master' into Projectiles. 2013-08-25 17:06:51 +02:00