Commit graph

1201 commits

Author SHA1 Message Date
Thinkofdeath
5fb051b619 Rewrite minecraft's movement handling to move it into the main tick loop 2014-07-07 10:24:24 +01:00
Thinkofdeath
0b49f96812 Revert "Move player ticking into the main loop"
This reverts commit 2238c55580.

This is temporary until a better solution can be found
2014-07-06 16:19:23 +01:00
md_5
b482b9fa94 Upstream merge 2014-07-05 20:58:48 +10:00
md_5
ce355b2fda Add a few comments to the first 14 patches. 2014-07-05 20:34:22 +10:00
Thinkofdeath
2238c55580 Move player ticking into the main loop 2014-07-04 20:24:31 +01:00
md_5
746b49bbdc Further Seed Customisation
Allow server admins that really want to to customise the seeds used in world generation even further.
2014-07-04 13:28:55 +10:00
Thinkofdeath
9d01c2ae7d Improve item nbt tag validation 2014-07-02 23:46:50 +01:00
Thinkofdeath
5d33c2f428 Revert "Enhance NBTReadLimiter."
This reverts commit 3b8159bf75.
2014-07-02 22:49:23 +01:00
md_5
3b8159bf75 Enhance NBTReadLimiter.
Add the ability to cap strings separate from total data.
2014-07-02 18:05:13 +10:00
Thinkofdeath
9873ea9d2d Only echo back the protocol version for versions we actually support 2014-06-30 16:30:41 +01:00
Thinkofdeath
843ef5d67c Prevent client desync when their placement/interaction is throttled 2014-06-30 16:16:10 +01:00
Thinkofdeath
3fc4f97a45 Limit block placement/interaction packets 2014-06-30 08:52:59 +01:00
Andrew Krieger
be8cb39e0e Use Entity.teleportTo for cross-world teleportation in CraftEntity. 2014-06-29 19:42:32 +10:00
md_5
d19827655b Re add ItemFrame / Fireball EntityDamageByEntityEvent fix 2014-06-27 20:54:49 +10:00
md_5
64352d6745 Upstream merge.
Mikeprimm's lighter nibble arrays have been removed since they have been incorporate d upstream.
2014-06-27 20:50:08 +10:00
Thinkofdeath
e436b2ead3 Don't ignore 0 damage for non-living entities 2014-06-27 09:42:43 +01:00
Thinkofdeath
c1e3bc4079 Always clear entityDamage on explosion 2014-06-27 00:13:41 +01:00
Thinkofdeath
a5c5ebeca4 Add damager to the unhandled error 2014-06-26 23:43:36 +01:00
Thinkofdeath
dd89784338 Remove the last patch 2014-06-26 23:28:47 +01:00
Thinkofdeath
d7d8709b75 Display unhandled damage sources 2014-06-26 22:49:14 +01:00
Thinkofdeath
f30795ae40 Fix explosions not moving invulnerable entities 2014-06-26 14:30:52 +01:00
md_5
f914ead1e1 Put Guava back to older version.
Whilst Guava ensures that the source is backwards compatible, unfortunately the binary ABI is not so. Going to need to look for a work around this.
2014-06-26 18:47:10 +10:00
md_5
dce4e57716 Ensure authlib is not repackaged 2014-06-26 17:19:01 +10:00
md_5
612aaf4e8a Convert solitary tab to spaces.
<~md_5|away> sublime text, why have you forsaken me?
2014-06-26 17:06:53 +10:00
md_5
6f2d4581ea Fix Jenkins build - don't try and deploy unless forced to. 2014-06-26 17:05:44 +10:00
md_5
de8d54ded0 Update Guava to 11.0.2.
Whilst it is possible for a change such as this to be breaking, the version bump in itself is very small and Guava only removes APIs after 18 months deprecation. Given the proliferation of servers such as MCPC bundling Guava versions of 14.0 upwards as well as the fact that developers should steer clear away from using deprecated APIs, it is very unlikely this change will cause any issues. Furthermore this version brings multiple bug fixes and represents the minimum version required by Minecraft itself.
2014-06-26 17:02:44 +10:00
md_5
19b4d2d286 Add a new subproject MinecraftRelocate which will generate a minecraft-server jar, but with the net.minecraft.util libraries in their original package. 2014-06-26 16:54:51 +10:00
md_5
aa3f8fad15 Add a .gitignore to the root repo 2014-06-26 16:49:30 +10:00
Thinkofdeath
c1a5c56d21 Ignore damage done by LivingEntity.damage() 2014-06-25 21:43:25 +01:00
thinkofdeath
660cd81376 Merge pull request #179 from Zbob750/fireball
Fix fireball EntityDamageByEntityEvent also
2014-06-24 22:51:56 +01:00
Zach Brown
c4f13a3cc6 Fix fireball EntityDamageByEntityEvent also 2014-06-24 16:49:15 -05:00
thinkofdeath
05219b2783 Merge pull request #178 from Zbob750/itemframes
Fix ItemFrame EntityDamageByEntityEvent
2014-06-24 16:09:21 +01:00
Zach Brown
bd1fdac1e3 Fix ItemFrame EntityDamageByEntityEvent 2014-06-24 09:56:28 -05:00
md_5
b4a543d2c5 Partial upstream merge.
Still need to validate how some changes interact with our own.
2014-06-24 18:00:00 +10:00
md_5
e46e6c46a1 Upstream merge, lots of conflicts 2014-06-22 19:28:17 +10:00
md_5
463e6f351e Shave nearly 2mb off jar size by not embedding our copy of trove since Minecraft now includes it. 2014-06-21 16:30:09 +10:00
md_5
b4f8ae96a2 Prevent Unbounded IntCache Growth
Based on work by Peter Lawrey, this commit prevents unbounded growth of the integer cache and instead caps it to a value specified in the configuration (1024 by default). Should prevent thrashing, especially around world generation.
2014-06-20 19:40:55 +10:00
Thinkofdeath
7f6d9d1fb7 Fix the restart command sometimes deadlocking the server 2014-06-14 16:01:05 +01:00
md_5
f2c8426b20 Revert LongHash changes 2014-06-11 21:07:22 +10:00
md_5
8d19f7fc9c Improve lsw too 2014-06-09 19:04:53 +10:00
Antony Riley
a9bcec2567 Improve LongHash performance - take #2 2014-06-09 18:58:20 +10:00
md_5
0dc2b96f20 Revert "Improve LongHash performance."
This reverts commit 1705259934.
2014-06-09 18:28:38 +10:00
Antony Riley
1705259934 Improve LongHash performance. 2014-06-09 17:52:31 +10:00
Thinkofdeath
27cb8a7e6d Upstream merge 2014-06-02 15:38:03 +01:00
Thinkofdeath
b572a59936 Fix some missed cases with data value blocking
The item and block forms of double plants have different rules
2014-05-30 20:28:14 +01:00
Evan A. Haskell
5daa7e5418 Better comments on hopper tick patch 2014-05-30 13:11:07 +10:00
Thinkofdeath
57147d925c Improve the data value filter to cover item stacks as well 2014-05-28 13:51:53 +01:00
md_5
ae34175e3d Upstream merge 2014-05-27 17:40:02 +10:00
md_5
95e4d28a35 Replace typing yes into the console with a 10 second wait - most have updated or are aware of the changes by now 2014-05-25 14:40:33 +10:00
drXor
551c6c2dd9 Add config option for when UserCache saves 2014-05-24 17:20:02 +10:00