Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-12-26 11:08:12 +01:00
Code Issues Projects Releases Wiki Activity

Removed the ReadWriteLock as it's superseeded by the BlockingHashMap.

Browse Source
This commit is contained in:
Kristian S. Stangeland 2012-11-23 08:52:02 +01:00
parent c49b1ddc02
commit d53b6dbee1
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java
View File

@ -1,9 +1,6 @@
package com.comphenix.protocol.injector.player;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.bukkit.Server;
import org.bukkit.entity.Player;
@ -29,8 +26,6 @@ class NetLoginInjector {
// The current error rerporter
private ErrorReporter reporter;
private ReadWriteLock injectionLock = new ReentrantReadWriteLock();
// Used to create fake players
private TemporaryPlayerFactory tempPlayerFactory = new TemporaryPlayerFactory();
@ -46,9 +41,6 @@ class NetLoginInjector {
* @return An injected NetLoginHandler, or the original object.
*/
public Object onNetLoginCreated(Object inserting) {
injectionLock.writeLock().lock();
try {
// Make sure we actually need to inject during this phase
if (!injectionHandler.isInjectionNecessary(GamePhase.LOGIN))
@ -73,19 +65,9 @@ class NetLoginInjector {
reporter.reportDetailed(this, "Unable to hook NetLoginHandler.", e, inserting);
return inserting;
} finally {
injectionLock.writeLock().unlock();
}
}
/**
* Retrieve the lock used for reading.
* @return Reading lock.
*/
public Lock getReadLock() {
return injectionLock.readLock();
}
/**
* Invoked when a NetLoginHandler should be reverted.
* @param inserting - the original NetLoginHandler.

2
ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java
View File

@ -216,7 +216,7 @@ public class PlayerInjectionHandler {
* @throws InterruptedException If the thread was interrupted during the wait.
*/
public Player getPlayerByConnection(DataInputStream inputStream, long playerTimeout, TimeUnit unit) throws InterruptedException {
// Wait until the connection owner has been established
PlayerInjector injector = dataInputLookup.get(inputStream, playerTimeout, unit);
if (injector != null) {